← Back to branch summary

~james-page/ubuntu/saucy/juju-core/1.16.5

« back to all changes in this revision

Viewing changes to src/launchpad.net/juju-core/provider/maas/environprovider.go

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2013-09-03 14:22:22 UTC
  • mfrom: (1.1.7)
  • Revision ID: package-import@ubuntu.com-20130903142222-9mes2r8wqr0bs7lp
Tags: 1.13.3-0ubuntu1
New upstream point release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/launchpad.net/juju-core/provider/maas/environprovider.go
4
4
package maas
5
5
 
6
6
import (
 
7
        "os"
 
8
 
7
9
        "launchpad.net/loggo"
8
10
 
9
11
        "launchpad.net/juju-core/environs"
10
12
        "launchpad.net/juju-core/environs/config"
 
13
        "launchpad.net/juju-core/instance"
 
14
        "launchpad.net/juju-core/juju/osenv"
 
15
        "launchpad.net/juju-core/utils"
11
16
)
12
17
 
13
18
// Logger for the MAAS provider.
32
37
        return env, nil
33
38
}
34
39
 
 
40
func (p maasEnvironProvider) Prepare(cfg *config.Config) (environs.Environ, error) {
 
41
        // TODO any attributes to prepare?
 
42
        return p.Open(cfg)
 
43
}
 
44
 
35
45
// Boilerplate config YAML.  Don't mess with the indentation or add newlines!
36
46
const boilerplateYAML = `maas:
37
47
  type: maas
63
73
}
64
74
 
65
75
func (maasEnvironProvider) hostname() (string, error) {
 
76
        // Hack to get container ip addresses properly for MAAS demo.
 
77
        if os.Getenv(osenv.JujuContainerType) == string(instance.LXC) {
 
78
                return utils.GetAddressForInterface("eth0")
 
79
        }
66
80
        info := machineInfo{}
67
81
        err := info.load()
68
82
        if err != nil {