| Index: container/lxc/lxc.go |
| === modified file 'container/lxc/lxc.go' |
| --- container/lxc/lxc.go 2013-07-18 21:43:30 +0000 |
| +++ container/lxc/lxc.go 2013-07-22 04:23:33 +0000 |
| @@ -11,6 +11,9 @@ |
| "strings" |
| "launchpad.net/golxc" |
| + "launchpad.net/loggo" |
| + |
| + "launchpad.net/juju-core/agent/tools" |
| "launchpad.net/juju-core/constraints" |
| "launchpad.net/juju-core/environs" |
| "launchpad.net/juju-core/environs/cloudinit" |
| @@ -18,7 +21,6 @@ |
| "launchpad.net/juju-core/instance" |
| "launchpad.net/juju-core/state" |
| "launchpad.net/juju-core/state/api" |
| - "launchpad.net/loggo" |
| ) |
| var logger = loggo.GetLogger("juju.container.lxc") |
| @@ -45,7 +47,7 @@ |
| // StartContainer creates and starts a new lxc container for the specified machine. |
| StartContainer( |
| machineId, series, nonce string, |
| - tools *state.Tools, |
| + tools *tools.Tools, |
| environConfig *config.Config, |
| stateInfo *state.Info, |
| apiInfo *api.Info) (instance.Instance, error) |
| @@ -74,7 +76,7 @@ |
| func (manager *containerManager) StartContainer( |
| machineId, series, nonce string, |
| - tools *state.Tools, |
| + tools *tools.Tools, |
| environConfig *config.Config, |
| stateInfo *state.Info, |
| apiInfo *api.Info) (instance.Instance, error) { |
| @@ -239,7 +241,7 @@ |
| func writeUserData( |
| directory, machineId, nonce string, |
| - tools *state.Tools, |
| + tools *tools.Tools, |
| environConfig *config.Config, |
| stateInfo *state.Info, |
| apiInfo *api.Info, |
| @@ -259,7 +261,7 @@ |
| func cloudInitUserData( |
| machineId, nonce string, |
| - tools *state.Tools, |
| + tools *tools.Tools, |
| environConfig *config.Config, |
| stateInfo *state.Info, |
| apiInfo *api.Info, |
