← Back to branch summary

~ubuntu-branches/ubuntu/vivid/juju-core/vivid-updates

« back to all changes in this revision

Viewing changes to src/github.com/juju/juju/provider/maas/instance.go

  • Committer: Package Import Robot
  • Author(s): Curtis C. Hovey
  • Date: 2015-09-29 19:43:29 UTC
  • mfrom: (47.1.4 wily-proposed)
  • Revision ID: package-import@ubuntu.com-20150929194329-9y496tbic30hc7vp
Tags: 1.24.6-0ubuntu1~15.04.1
https://launchpad.net/bugs/1500916
https://launchpad.net/bugs/1497087
Backport of 1.24.6 from wily. (LP: #1500916, #1497087)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/github.com/juju/juju/provider/maas/instance.go
75
75
        if err != nil {
76
76
                return nil, err
77
77
        }
78
 
        host := network.Address{name, network.HostName, "", network.ScopePublic}
79
 
        addrs := []network.Address{host}
80
78
        // MAAS prefers to use the dns name for intra-node communication.
81
 
        // When Juju looks up the address to use for communicating between nodes, it looks
82
 
        // up the address bu scope. So we add a cloud local address for that purpose.
83
 
        cloudHost := network.Address{name, network.HostName, "", network.ScopeCloudLocal}
84
 
        addrs = append(addrs, cloudHost)
 
79
        // When Juju looks up the address to use for communicating between
 
80
        // nodes, it looks up the address by scope. So we add a cloud
 
81
        // local address for that purpose.
 
82
        addrs := network.NewAddresses(name, name)
 
83
        addrs[0].Scope = network.ScopePublic
 
84
        addrs[1].Scope = network.ScopeCloudLocal
85
85
 
 
86
        // Append any remaining IP addresses after the preferred ones.
86
87
        ips, err := mi.ipAddresses()
87
88
        if err != nil {
88
89
                return nil, err
89
90
        }
90
 
 
91
 
        for _, ip := range ips {
92
 
                a := network.NewAddress(ip, network.ScopeUnknown)
93
 
                addrs = append(addrs, a)
94
 
        }
 
91
        addrs = append(addrs, network.NewAddresses(ips...)...)
95
92
 
96
93
        return addrs, nil
97
94
}