Merge lp:~jaywink/charms/trusty/block-storage-broker/fix-for-trusty into lp:~lazypower/charms/trusty/block-storage-broker/trunk

[Jason Robinson]

Fixes relating to trusty have been made to the precise charm. Merged them in to this trusty branch. Tested charm works now on trusty too.

[Jason Robinson (jaywink)]

Hmm it seems bazaar doesn't keep the actual commits (2x) which I merged in. Maybe you could merge them in to trusty/block-storage-broker/trunk directly, instead of this?

Unmerged revisions

53. By Jason Robinson on 2014-07-30

Merge fixes to allow running on trusty

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2014-03-21 17:38:30 +0000
+++ hooks/hooks.py	2014-08-01 19:37:46 +0000
@@ -7,7 +7,7 @@
 import json
 import os
 import sys
-from util import StorageServiceUtil, generate_volume_label
+from util import StorageServiceUtil, generate_volume_label, get_running_series
 
 hooks = hookenv.Hooks()
 
@@ -83,7 +83,8 @@
     provider = hookenv.config("provider")
     if provider == "nova":
         required_packages = ["python-novaclient"]
-        fetch.add_source("cloud-archive:havana")
+        if int(get_running_series()['release'].split(".")[0]) < 14:
+            fetch.add_source("cloud-archive:havana")
     elif provider == "ec2":
         required_packages = ["euca2ools"]
     fetch.apt_update(fatal=True)

=== modified file 'hooks/util.py'
--- hooks/util.py	2014-03-21 17:39:48 +0000
+++ hooks/util.py	2014-08-01 19:37:46 +0000
@@ -373,7 +373,7 @@
                 continue
             (_, key, value, _) = line.split("|")
             key = key.strip()
-            value = value.strip()
+            value = value.replace("null", "None").strip()
             if key in ["availability_zone", "size", "id", "snapshot_id",
                        "status"]:
                 result[key] = value
@@ -470,3 +470,18 @@
 def generate_volume_label(remote_unit):
     """Create a volume label for the requesting remote unit"""
     return "%s unit volume" % remote_unit
+
+
+def get_running_series():
+    lsb_release = "/etc/lsb-release"
+    series = {}
+    with open(lsb_release) as f:
+        for line in f:
+            line = line.strip()
+            if line.startswith('DISTRIB_CODENAME'):
+                series['codename'] = line.split('=')[1]
+            if line.startswith('DISTRIB_RELEASE'):
+                series['release'] = line.split('=')[1]
+            if line.startswith('DISTRIB_DESCRIPTION'):
+                series['description'] = line.split('=')[1]
+    return series