~juju-qa/ubuntu/xenial/juju/xenial-2.0-beta3

« back to all changes in this revision

Viewing changes to src/github.com/juju/juju/cmd/jujud/main.go

  • Committer: Martin Packman
  • Date: 2016-03-30 19:31:08 UTC
  • mfrom: (1.1.41)
  • Revision ID: martin.packman@canonical.com-20160330193108-h9iz3ak334uk0z5r
Merge new upstream source 2.0~beta3

Show diffs side-by-side

added added

removed removed

Lines of Context:
27
27
        "github.com/juju/juju/juju/sockets"
28
28
        // Import the providers.
29
29
        _ "github.com/juju/juju/provider/all"
30
 
        "github.com/juju/juju/storage/looputil"
31
30
        "github.com/juju/juju/worker/logsender"
32
31
        "github.com/juju/juju/worker/uniter/runner/jujuc"
33
32
)
152
151
        // MachineAgent type has called out the separate concerns; the
153
152
        // AgentConf should be split up to follow suit.
154
153
        agentConf := agentcmd.NewAgentConf("")
155
 
        machineAgentFactory := agentcmd.MachineAgentFactoryFn(
156
 
                agentConf, logCh, looputil.NewLoopDeviceManager(), "",
157
 
        )
 
154
        machineAgentFactory := agentcmd.MachineAgentFactoryFn(agentConf, logCh, "")
158
155
        jujud.Register(agentcmd.NewMachineAgentCmd(ctx, machineAgentFactory, agentConf, agentConf))
159
156
 
160
157
        jujud.Register(agentcmd.NewUnitAgent(ctx, logCh))