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

[James Page]

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

charm_lint_check #3803 nova-compute-next for james-page mp257104
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
make: *** [lint] Error 1
ERROR:root:Make target returned non-zero.

Full lint test output: http://paste.ubuntu.com/10866220/
Build: http://10.245.162.77:8080/job/charm_lint_check/3803/

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

charm_unit_test #3590 nova-compute-next for james-page mp257104
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/3590/

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

129. By James Page on 2015-04-22

Fixup lint

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

charm_lint_check #3808 nova-compute-next for james-page mp257104
    LINT OK: passed

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

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

charm_unit_test #3595 nova-compute-next for james-page mp257104
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/3595/

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

charm_amulet_test #3594 nova-compute-next for james-page mp257104
    AMULET OK: passed

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

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

130. By James Page on 2015-04-23

Fixup minor bits and pieces

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

charm_lint_check #3861 nova-compute-next for james-page mp257104
    LINT OK: passed

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

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

charm_unit_test #3648 nova-compute-next for james-page mp257104
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/3648/

[Liam Young (gnuoy)]

Approve

review: Approve

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

charm_amulet_test #3651 nova-compute-next for james-page mp257104
    AMULET OK: passed

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

=== modified file 'config.yaml'
--- config.yaml	2015-04-15 14:21:42 +0000
+++ config.yaml	2015-04-23 13:32:19 +0000
@@ -75,7 +75,7 @@
   virt-type:
     default: kvm
     type: string
-    description: "Virtualization flavor. Supported: kvm, xen, uml, lxc. qemu"
+    description: "Virtualization flavor. Supported: kvm, xen, uml, lxc, qemu, lxd"
   multi-host:
     default: "yes"
     type: string

=== modified file 'hooks/nova_compute_hooks.py'
--- hooks/nova_compute_hooks.py	2015-04-15 14:21:42 +0000
+++ hooks/nova_compute_hooks.py	2015-04-23 13:32:19 +0000
@@ -60,6 +60,7 @@
     QUANTUM_CONF, NEUTRON_CONF,
     ceph_config_file, CEPH_SECRET,
     enable_shell, disable_shell,
+    configure_lxd,
     fix_path_ownership,
     get_topics,
     assert_charm_supports_ipv6,
@@ -129,6 +130,9 @@
         fp = config('instances-path')
         fix_path_ownership(fp, user='nova')
 
+    if config('virt-type').lower() == 'lxd':
+        configure_lxd(user='nova')
+
     [compute_joined(rid) for rid in relation_ids('cloud-compute')]
     for rid in relation_ids('zeromq-configuration'):
         zeromq_configuration_relation_joined(rid)

=== modified file 'hooks/nova_compute_utils.py'
--- hooks/nova_compute_utils.py	2015-04-15 19:16:26 +0000
+++ hooks/nova_compute_utils.py	2015-04-23 13:32:19 +0000
@@ -4,7 +4,7 @@
 
 from base64 import b64decode
 from copy import deepcopy
-from subprocess import check_call, check_output
+from subprocess import check_call, check_output, CalledProcessError
 
 from charmhelpers.fetch import (
     apt_update,
@@ -34,6 +34,7 @@
 )
 
 from charmhelpers.core.templating import render
+from charmhelpers.core.decorators import retry_on_exception
 from charmhelpers.contrib.openstack.neutron import neutron_plugin_attribute
 from charmhelpers.contrib.openstack import templating, context
 from charmhelpers.contrib.openstack.alternatives import install_alternative
@@ -122,6 +123,7 @@
     'quantum-server',
 ]
 
+DEFAULT_INSTANCE_PATH = '/var/lib/nova/instances'
 NOVA_CONF_DIR = "/etc/nova"
 QEMU_CONF = '/etc/libvirt/qemu.conf'
 LIBVIRTD_CONF = '/etc/libvirt/libvirtd.conf'
@@ -130,22 +132,6 @@
 NOVA_CONF = '%s/nova.conf' % NOVA_CONF_DIR
 
 BASE_RESOURCE_MAP = {
-    QEMU_CONF: {
-        'services': ['libvirt-bin'],
-        'contexts': [],
-    },
-    LIBVIRTD_CONF: {
-        'services': ['libvirt-bin'],
-        'contexts': [NovaComputeLibvirtContext()],
-    },
-    LIBVIRT_BIN: {
-        'services': ['libvirt-bin'],
-        'contexts': [NovaComputeLibvirtContext()],
-    },
-    LIBVIRT_BIN_OVERRIDES: {
-        'services': ['libvirt-bin'],
-        'contexts': [NovaComputeLibvirtOverrideContext()],
-    },
     NOVA_CONF: {
         'services': ['nova-compute'],
         'contexts': [context.AMQPContext(ssl_dir=NOVA_CONF_DIR),
@@ -171,6 +157,26 @@
     },
 }
 
+LIBVIRT_RESOURCE_MAP = {
+    QEMU_CONF: {
+        'services': ['libvirt-bin'],
+        'contexts': [],
+    },
+    LIBVIRTD_CONF: {
+        'services': ['libvirt-bin'],
+        'contexts': [NovaComputeLibvirtContext()],
+    },
+    LIBVIRT_BIN: {
+        'services': ['libvirt-bin'],
+        'contexts': [NovaComputeLibvirtContext()],
+    },
+    LIBVIRT_BIN_OVERRIDES: {
+        'services': ['libvirt-bin'],
+        'contexts': [NovaComputeLibvirtOverrideContext()],
+    },
+}
+LIBVIRT_RESOURCE_MAP.update(BASE_RESOURCE_MAP)
+
 CEPH_SECRET = '/etc/ceph/secret.xml'
 
 CEPH_RESOURCES = {
@@ -212,6 +218,7 @@
     'xen': ['nova-compute-xen'],
     'uml': ['nova-compute-uml'],
     'lxc': ['nova-compute-lxc'],
+    'lxd': ['nova-compute-lxd'],
 }
 
 # Maps virt-type config to a libvirt URI.
@@ -230,7 +237,10 @@
     hook execution.
     '''
     # TODO: Cache this on first call?
-    resource_map = deepcopy(BASE_RESOURCE_MAP)
+    if config('virt-type').lower() == 'lxd':
+        resource_map = deepcopy(BASE_RESOURCE_MAP)
+    else:
+        resource_map = deepcopy(LIBVIRT_RESOURCE_MAP)
     net_manager = network_manager()
     plugin = neutron_plugin()
 
@@ -554,6 +564,36 @@
     check_call(cmd)
 
 
+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
+    lxc_list(user)
+
+
+@retry_on_exception(5, base_delay=2, exc_type=CalledProcessError)
+def lxc_list(user):
+    cmd = ['sudo', '-u', user, 'lxc', 'list']
+    check_call(cmd)
+
+
+def configure_subuid(user):
+    cmd = ['usermod', '-v', '100000-200000', '-w', '100000-200000', user]
+    check_call(cmd)
+
+
 def enable_shell(user):
     cmd = ['usermod', '-s', '/bin/bash', user]
     check_call(cmd)

=== modified file 'templates/kilo/nova.conf'
--- templates/kilo/nova.conf	2015-04-21 10:12:04 +0000
+++ templates/kilo/nova.conf	2015-04-23 13:32:19 +0000
@@ -19,7 +19,6 @@
 api_paste_config=/etc/nova/api-paste.ini
 enabled_apis=ec2,osapi_compute,metadata
 auth_strategy=keystone
-compute_driver=libvirt.LibvirtDriver
 my_ip = {{ host_ip }}
 
 {% if arch == 'aarch64' -%}

=== modified file 'unit_tests/test_nova_compute_utils.py'
--- unit_tests/test_nova_compute_utils.py	2015-04-15 19:16:26 +0000
+++ unit_tests/test_nova_compute_utils.py	2015-04-23 13:32:19 +0000
@@ -23,9 +23,12 @@
     'related_units',
     'relation_ids',
     'relation_get',
+    'service_restart',
     'mkdir',
     'install_alternative',
+    'add_user_to_group',
     'MetadataServiceContext',
+    'lsb_release',
 ]
 
 OVS_PKGS = [
@@ -397,6 +400,12 @@
                                         'dummy'])
 
     @patch.object(utils, 'check_call')
+    def test_configure_subuid(self, _check_call):
+        utils.configure_subuid('dummy')
+        _check_call.assert_called_with(['usermod', '-v', '100000-200000',
+                                        '-w', '100000-200000', 'dummy'])
+
+    @patch.object(utils, 'check_call')
     @patch.object(utils, 'check_output')
     def test_create_libvirt_key(self, _check_output, _check_call):
         key = 'AQCR2dRUaFQSOxAAC5fr79sLL3d7wVvpbbRFMg=='
@@ -448,6 +457,38 @@
                                      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):
+        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):
+        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():