Merge lp:~james-page/charms/trusty/nova-compute/lxd-liberty into lp:~openstack-charmers-archive/charms/trusty/nova-compute/next

[James Page]

[lp:~james-page/charms/trusty/nova-compute/lxd-liberty]

185. By James Page on 2015-12-09

Ensure python-openssl is upgraded during install of nova-compute-lxd

186. By James Page on 2015-12-09

Revert last commit

Unmerged revisions

186. By James Page on 2015-12-09

Revert last commit

185. By James Page on 2015-12-09

Ensure python-openssl is upgraded during install of nova-compute-lxd

184. By James Page on 2015-12-01

LXD is supported generally on liberty, so make that the baseline

=== modified file 'hooks/nova_compute_utils.py'
--- hooks/nova_compute_utils.py	2015-12-02 09:55:37 +0000
+++ hooks/nova_compute_utils.py	2015-12-09 11:33:30 +0000
@@ -598,9 +598,9 @@
 def configure_lxd(user='nova'):
     ''' Configure lxd use for nova user '''
     if not git_install_requested():
-        if lsb_release()['DISTRIB_CODENAME'].lower() < "vivid":
-            raise Exception("LXD is not supported for Ubuntu "
-                            "versions less than 15.04 (vivid)")
+        if os_release('nova-common') < 'liberty':
+            raise Exception("LXD is not supported for OpenStack "
+                            "versions prior to Liberty")
 
     configure_subuid(user)
     lxc_list(user)