← Back to branch summary

~juju-qa/ubuntu/xenial/juju/xenial-2.0-beta3

« back to all changes in this revision

Viewing changes to src/github.com/juju/juju/provider/openstack/config.go

  • Committer: Martin Packman
  • Date: 2016-03-30 19:31:08 UTC
  • mfrom: (1.1.41)
  • Revision ID: martin.packman@canonical.com-20160330193108-h9iz3ak334uk0z5r
Merge new upstream source 2.0~beta3

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/github.com/juju/juju/provider/openstack/config.go
110
110
        return c.attrs["tenant-name"].(string)
111
111
}
112
112
 
 
113
func (c *environConfig) domainName() string {
 
114
        dname, ok := c.attrs["domain-name"]
 
115
        if ok {
 
116
                return dname.(string)
 
117
        }
 
118
        return ""
 
119
}
 
120
 
113
121
func (c *environConfig) authURL() string {
114
122
        return c.attrs["auth-url"].(string)
115
123
}
165
173
        if err != nil {
166
174
                return nil, err
167
175
        }
168
 
 
169
 
        // Add Openstack specific defaults.
170
 
        providerDefaults := map[string]interface{}{}
171
 
 
172
 
        // Storage.
173
 
        if _, ok := cfg.StorageDefaultBlockSource(); !ok {
174
 
                providerDefaults[config.StorageDefaultBlockSourceKey] = CinderProviderType
175
 
        }
176
 
        if len(providerDefaults) > 0 {
177
 
                if cfg, err = cfg.Apply(providerDefaults); err != nil {
178
 
                        return nil, err
179
 
                }
180
 
        }
181
 
 
182
176
        ecfg := &environConfig{cfg, validated}
183
177
 
184
178
        switch ecfg.authMode() {