← 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/cinder.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/cinder.go
53
53
        if err != nil {
54
54
                return nil, err
55
55
        }
56
 
        uuid, ok := environConfig.UUID()
57
 
        if !ok {
58
 
                return nil, errors.NotFoundf("model UUID")
59
 
        }
60
56
        source := &cinderVolumeSource{
61
57
                storageAdapter: storageAdapter,
62
58
                envName:        environConfig.Name(),
63
 
                modelUUID:      uuid,
 
59
                modelUUID:      environConfig.UUID(),
64
60
        }
65
61
        return source, nil
66
62
}