← Back to branch summary

~themue/juju-core/053-env-more-script-friendly

« back to all changes in this revision

Viewing changes to environs/cloudinit/cloudinit.go

  • Committer: Dimiter Naydenov
  • Date: 2013-07-29 15:15:41 UTC
  • mto: This revision was merged to the branch mainline in revision 1565.
  • Revision ID: dimiter.naydenov@canonical.com-20130729151541-zm8murwo9u7mtsdu
names: new package

Show diffs side-by-side

added added

removed removed

Lines of Context:
environs/cloudinit/cloudinit.go
17
17
        "launchpad.net/juju-core/environs/config"
18
18
        "launchpad.net/juju-core/instance"
19
19
        "launchpad.net/juju-core/log/syslog"
 
20
        "launchpad.net/juju-core/names"
20
21
        "launchpad.net/juju-core/state"
21
22
        "launchpad.net/juju-core/state/api"
22
23
        "launchpad.net/juju-core/upstart"
167
168
        // It would be cleaner to change bootstrap-state to
168
169
        // be responsible for starting the machine agent itself,
169
170
        // but this would not be backwardly compatible.
170
 
        machineTag := state.MachineTag(cfg.MachineId)
 
171
        machineTag := names.MachineTag(cfg.MachineId)
171
172
        _, err := cfg.addAgentInfo(c, machineTag)
172
173
        if err != nil {
173
174
                return nil, err
216
217
        var configRenderer syslog.SyslogConfigRenderer
217
218
        if cfg.StateServer {
218
219
                configRenderer = syslog.NewAccumulateConfig(
219
 
                        state.MachineTag(cfg.MachineId))
 
220
                        names.MachineTag(cfg.MachineId))
220
221
        } else {
221
222
                configRenderer = syslog.NewForwardConfig(
222
 
                        state.MachineTag(cfg.MachineId), cfg.stateHostAddrs())
 
223
                        names.MachineTag(cfg.MachineId), cfg.stateHostAddrs())
223
224
        }
224
225
        content, err := configRenderer.Render()
225
226
        if err != nil {
373
374
 
374
375
func verifyConfig(cfg *MachineConfig) (err error) {
375
376
        defer utils.ErrorContextf(&err, "invalid machine configuration")
376
 
        if !state.IsMachineId(cfg.MachineId) {
 
377
        if !names.IsMachineId(cfg.MachineId) {
377
378
                return fmt.Errorf("invalid machine id")
378
379
        }
379
380
        if cfg.DataDir == "" {
426
427
                if len(cfg.StateInfo.Addrs) == 0 {
427
428
                        return fmt.Errorf("missing state hosts")
428
429
                }
429
 
                if cfg.StateInfo.Tag != state.MachineTag(cfg.MachineId) {
 
430
                if cfg.StateInfo.Tag != names.MachineTag(cfg.MachineId) {
430
431
                        return fmt.Errorf("entity tag must match started machine")
431
432
                }
432
433
                if len(cfg.APIInfo.Addrs) == 0 {
433
434
                        return fmt.Errorf("missing API hosts")
434
435
                }
435
 
                if cfg.APIInfo.Tag != state.MachineTag(cfg.MachineId) {
 
436
                if cfg.APIInfo.Tag != names.MachineTag(cfg.MachineId) {
436
437
                        return fmt.Errorf("entity tag must match started machine")
437
438
                }
438
439
        }