Merge lp:~roadmr/charms/precise/storage/volume-label-option into lp:charms/storage

[Daniel Manrique]

Add volume_label option.

If given, this is the name of the volume that will be requested from block_storage_broker.
Otherwise, a default name will be chosen by the storage charm and requested from block_storage_broker.

Add volume_label option.

If given, this is the name of the volume that will be requested from block_storage_broker. Otherwise, a default name will be chosen by the storage charm and requested from block_storage_broker.

This is necessary in environments where two services may request conflicting volume names, and so is a workaround/indirect solution for https://bugs.launchpad.net/charms/+source/block-storage-broker/+bug/1487636.

I didn't add any unit tests since I couldn't figure out how, but I'd be happy to add them if someone can help me with ideas on how to test this (I did test it manually on a live environment, of course).

[Charles Butler (lazypower)]

+1 LGTM

Thanks for the contribution Daniel

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2015-06-25 18:19:30 +0000
+++ config.yaml	2015-09-02 14:48:06 +0000
@@ -26,6 +26,13 @@
         description: |
             The volume size in GB to request from the block-storage-broker.
         default: 5
+    volume_label:
+        type: string
+        description: |
+            The volume label to use. If not specified, a label of "$(unit)
+            $(availability zone) volume" will be automatically requested from
+            block-storage-broker.
+        default: ""
     device_timeout: 
         type: int
         description: |

=== modified file 'hooks/storage-provider.d/block-storage-broker/block-storage-relation-changed'
--- hooks/storage-provider.d/block-storage-broker/block-storage-relation-changed	2015-06-25 18:19:30 +0000
+++ hooks/storage-provider.d/block-storage-broker/block-storage-relation-changed	2015-09-02 14:48:06 +0000
@@ -17,7 +17,9 @@
 relids = hookenv.relation_ids("data")
 for relid in relids:
     for unit in hookenv.related_units(relid):
-        label = "%s %s volume" % (unit, availability_zone)
+        label = config_data.get("volume_label", None)
+        if not label:
+            label = "%s %s volume" % (unit, availability_zone)
         if volume_map is not None:
             # Grab the volume_label for our instance if it exists so we can
             # request that volume-id from the block-storage-broker