OLD | NEW |
1 // Copyright 2012, 2013 Canonical Ltd. | 1 // Copyright 2012, 2013 Canonical Ltd. |
2 // Licensed under the AGPLv3, see LICENCE file for details. | 2 // Licensed under the AGPLv3, see LICENCE file for details. |
3 | 3 |
4 package provisioner | 4 package provisioner |
5 | 5 |
6 import ( | 6 import ( |
7 "sync" | 7 "sync" |
8 | 8 |
| 9 "github.com/juju/errors" |
9 "github.com/juju/loggo" | 10 "github.com/juju/loggo" |
10 "launchpad.net/tomb" | 11 "launchpad.net/tomb" |
11 | 12 |
12 "launchpad.net/juju-core/agent" | 13 "launchpad.net/juju-core/agent" |
13 "launchpad.net/juju-core/environs" | 14 "launchpad.net/juju-core/environs" |
14 "launchpad.net/juju-core/environs/config" | 15 "launchpad.net/juju-core/environs/config" |
15 "launchpad.net/juju-core/errors" | |
16 "launchpad.net/juju-core/instance" | 16 "launchpad.net/juju-core/instance" |
17 apiprovisioner "launchpad.net/juju-core/state/api/provisioner" | 17 apiprovisioner "launchpad.net/juju-core/state/api/provisioner" |
18 apiwatcher "launchpad.net/juju-core/state/api/watcher" | 18 apiwatcher "launchpad.net/juju-core/state/api/watcher" |
19 "launchpad.net/juju-core/state/watcher" | 19 "launchpad.net/juju-core/state/watcher" |
20 "launchpad.net/juju-core/worker" | 20 "launchpad.net/juju-core/worker" |
21 ) | 21 ) |
22 | 22 |
23 var logger = loggo.GetLogger("juju.provisioner") | 23 var logger = loggo.GetLogger("juju.provisioner") |
24 | 24 |
25 // Ensure our structs implement the required Provisioner interface. | 25 // Ensure our structs implement the required Provisioner interface. |
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
261 machine, err := p.getMachine() | 261 machine, err := p.getMachine() |
262 if err != nil { | 262 if err != nil { |
263 return nil, err | 263 return nil, err |
264 } | 264 } |
265 return machine.WatchContainers(p.containerType) | 265 return machine.WatchContainers(p.containerType) |
266 } | 266 } |
267 | 267 |
268 func (p *containerProvisioner) getRetryWatcher() (apiwatcher.NotifyWatcher, erro
r) { | 268 func (p *containerProvisioner) getRetryWatcher() (apiwatcher.NotifyWatcher, erro
r) { |
269 return nil, errors.NotImplementedf("getRetryWatcher") | 269 return nil, errors.NotImplementedf("getRetryWatcher") |
270 } | 270 } |
OLD | NEW |