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

« back to all changes in this revision

Viewing changes to src/github.com/juju/juju/apiserver/common/storagecommon/storage.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:
256
256
        storageInstance state.StorageInstance,
257
257
        cfg *config.Config,
258
258
) (map[string]string, error) {
259
 
        uuid, _ := cfg.UUID()
260
 
        storageTags := tags.ResourceTags(names.NewModelTag(uuid), cfg)
 
259
        storageTags := tags.ResourceTags(names.NewModelTag(cfg.UUID()), cfg)
261
260
        if storageInstance != nil {
262
261
                storageTags[tags.JujuStorageInstance] = storageInstance.Tag().Id()
263
262
                storageTags[tags.JujuStorageOwner] = storageInstance.Owner().Id()