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

[James Page]

Updates to support LXD for Wily

[lp:~openstack-charmers/charms/trusty/nova-compute/lxd-updates]

168. By James Page on 2015-10-01

Fixup unit tests

169. By James Page on 2015-10-01

Fixup lint

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #11154 nova-compute-next for james-page mp273104
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/11154/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #6935 nova-compute-next for james-page mp273104
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/6935/

[Liam Young (gnuoy)]

Approved

review: Approve

=== added symlink 'hooks/lxd-relation-changed'
=== target is u'nova_compute_hooks.py'
=== added symlink 'hooks/lxd-relation-joined'
=== target is u'nova_compute_hooks.py'
=== modified file 'hooks/nova_compute_hooks.py'
--- hooks/nova_compute_hooks.py	2015-09-29 15:14:35 +0000
+++ hooks/nova_compute_hooks.py	2015-10-01 17:04:21 +0000
@@ -76,6 +76,8 @@
     get_ipv6_addr
 )
 
+from charmhelpers.core.unitdata import kv
+
 from nova_compute_context import (
     CEPH_SECRET_UUID,
     assert_libvirt_imagebackend_allowed
@@ -148,7 +150,6 @@
         fix_path_ownership(fp, user='nova')
 
     if config('virt-type').lower() == 'lxd':
-        status_set('maintenance', 'Configure LXD')
         configure_lxd(user='nova')
 
     [compute_joined(rid) for rid in relation_ids('cloud-compute')]
@@ -423,6 +424,22 @@
     CONFIGS.write(NOVA_CONF)
 
 
[e-mail]('lxd-relation-joined')
+def lxd_joined(relid=None):
+    relation_set(relation_id=relid,
+                 user='nova')
+
+
[e-mail]('lxd-relation-changed')
+def lxc_changed():
+    nonce = relation_get('nonce')
+    db = kv()
+    if nonce and db.get('lxd-nonce') != nonce:
+        db.set('lxd-nonce', nonce)
+        configure_lxd(user='nova')
+        service_restart('nova-compute')
+
+
 def main():
     try:
         hooks.execute(sys.argv)

=== modified file 'hooks/nova_compute_utils.py'
--- hooks/nova_compute_utils.py	2015-10-01 15:07:37 +0000
+++ hooks/nova_compute_utils.py	2015-10-01 17:04:21 +0000
@@ -5,7 +5,11 @@
 
 from base64 import b64decode
 from copy import deepcopy
-from subprocess import check_call, check_output, CalledProcessError
+from subprocess import (
+    check_call,
+    check_output,
+    CalledProcessError
+)
 
 from charmhelpers.fetch import (
     apt_update,
@@ -134,6 +138,7 @@
     'nova-compute',
     'nova-compute-kvm',
     'nova-compute-lxc',
+    'nova-compute-lxd',
     'nova-compute-qemu',
     'nova-compute-uml',
     'nova-compute-xen',
@@ -598,20 +603,12 @@
 
 def configure_lxd(user='nova'):
     ''' Configure lxd use for nova user '''
-    if lsb_release()['DISTRIB_CODENAME'].lower() < "vivid":
-        raise Exception("LXD is not supported for Ubuntu "
-                        "versions less than 15.04 (vivid)")
-
-    configure_subuid(user='nova')
-    configure_lxd_daemon(user='nova')
-
-    service_restart('nova-compute')
-
-
-def configure_lxd_daemon(user):
-    add_user_to_group(user, 'lxd')
-    service_restart('lxd')
-    # NOTE(jamespage): Call list function to initialize cert
+    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)")
+
+    configure_subuid(user)
     lxc_list(user)
 
 

=== modified file 'metadata.yaml'
--- metadata.yaml	2015-09-17 11:36:07 +0000
+++ metadata.yaml	2015-10-01 17:04:21 +0000
@@ -24,6 +24,9 @@
     interface: glance
   ceph:
     interface: ceph-client
+  lxd:
+    interface: containers
+    scope: container
   nova-ceilometer:
     interface: nova-ceilometer
     scope: container

=== added file 'templates/git/nova-compute-lxd.conf'
--- templates/git/nova-compute-lxd.conf	1970-01-01 00:00:00 +0000
+++ templates/git/nova-compute-lxd.conf	2015-10-01 17:04:21 +0000
@@ -0,0 +1,2 @@
+[DEFAULT]
+compute_driver=nclxd.nova.virt.lxd.LXDDriver

=== modified file 'unit_tests/test_nova_compute_utils.py'
--- unit_tests/test_nova_compute_utils.py	2015-09-17 11:36:07 +0000
+++ unit_tests/test_nova_compute_utils.py	2015-10-01 17:04:21 +0000
@@ -463,37 +463,22 @@
                                      compute_context.CEPH_SECRET_UUID,
                                      '--base64', key])
 
-    @patch.object(utils, 'check_call')
-    @patch.object(utils, 'check_output')
-    def test_configure_lxd_daemon(self, _check_output, _check_call):
-        self.test_config.set('virt-type', 'lxd')
-        utils.configure_lxd_daemon('nova')
-        self.add_user_to_group.assert_called_with('nova', 'lxd')
-        self.service_restart.assert_called_with('lxd')
-        _check_output.assert_called_wth(['sudo', '-u', 'nova', 'lxc', 'list'])
-
-    @patch.object(utils, 'configure_lxd_daemon')
     @patch.object(utils, 'configure_subuid')
-    def test_configure_lxd_vivid(self, _configure_subuid,
-                                 _configure_lxd_daemon):
+    def test_configure_lxd_vivid(self, _configure_subuid):
         self.lsb_release.return_value = {
             'DISTRIB_CODENAME': 'vivid'
         }
         utils.configure_lxd('nova')
         _configure_subuid.assert_called_with(user='nova')
-        _configure_lxd_daemon.assert_called_with(user='nova')
 
-    @patch.object(utils, 'configure_lxd_daemon')
     @patch.object(utils, 'configure_subuid')
-    def test_configure_lxd_pre_vivid(self, _configure_subuid,
-                                     _configure_lxd_daemon):
+    def test_configure_lxd_pre_vivid(self, _configure_subuid):
         self.lsb_release.return_value = {
             'DISTRIB_CODENAME': 'trusty'
         }
         with self.assertRaises(Exception):
             utils.configure_lxd('nova')
         self.assertFalse(_configure_subuid.called)
-        self.assertFalse(_configure_lxd_daemon.called)
 
     def test_enable_nova_metadata(self):
         class DummyContext():