← Back to branch summary

~rogpeppe/juju-core/themue-058-debug-log-api

« back to all changes in this revision

Viewing changes to cmd/jujud/machine.go

  • Committer: Frank Mueller
  • Date: 2014-01-23 14:14:49 UTC
  • mfrom: (2152.1.95 juju-core)
  • Revision ID: frank.mueller@canonical.com-20140123141449-b30l57y7gs3wjkpw
debugger: merged trunk and fixed permission and interface problems

Show diffs side-by-side

added added

removed removed

Lines of Context:
cmd/jujud/machine.go
207
207
                        runner.StartWorker("environ-provisioner", func() (worker.Worker, error) {
208
208
                                return provisioner.NewEnvironProvisioner(st.Provisioner(), agentConfig), nil
209
209
                        })
210
 
                        // TODO(dimitern): Add firewaller here, when using the API.
 
210
                        // TODO(axw) 2013-09-24 bug #1229506
 
211
                        // Make another job to enable the firewaller. Not all environments
 
212
                        // are capable of managing ports centrally.
 
213
                        runner.StartWorker("firewaller", func() (worker.Worker, error) {
 
214
                                return firewaller.NewFirewaller(st.Firewaller())
 
215
                        })
211
216
                case params.JobManageState:
212
217
                        runner.StartWorker("charm-revision-updater", func() (worker.Worker, error) {
213
218
                                return charmrevisionworker.NewRevisionUpdateWorker(st.CharmRevisionUpdater()), nil
297
302
                case state.JobHostUnits:
298
303
                        // Implemented in APIWorker.
299
304
                case state.JobManageEnviron:
300
 
                        // TODO(axw) 2013-09-24 bug #1229506
301
 
                        // Make another job to enable the firewaller. Not all environments
302
 
                        // are capable of managing ports centrally.
303
 
                        runner.StartWorker("firewaller", func() (worker.Worker, error) {
304
 
                                return firewaller.NewFirewaller(st), nil
305
 
                        })
306
305
                        runner.StartWorker("addressupdater", func() (worker.Worker, error) {
307
306
                                return addressupdater.NewWorker(st), nil
308
307
                        })