Merge lp:~hopem/charms/trusty/nova-compute/rbd-imagebackend-support into lp:~openstack-charmers-archive/charms/trusty/nova-compute/next

[Edward Hope-Morley]

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

charm_lint_check #171 nova-compute-next for hopem mp244708
    LINT OK: passed

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

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

charm_unit_test #205 nova-compute-next for hopem mp244708
    UNIT OK: passed

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

=== modified file 'config.yaml'
--- config.yaml	2014-12-11 20:11:41 +0000
+++ config.yaml	2014-12-15 10:50:53 +0000
@@ -154,6 +154,29 @@
       order for this charm to function correctly, the privacy extension must be
       disabled and a non-temporary address must be configured/available on
       your network interface.
+  libvirt-image-backend:
+    default: ""
+    type: string
+    description:
+      Tell Nova which libvirt image backend to use. Supported backends are rbd and lvm.
+      If no backend is specified, the Nova default is used (probably qcow2).
+  rbd-pool:
+    default: "nova"
+    type: string
+    description: |
+      RBD pool to use with Nova RBD image backend. Only required when
+      libvirt_image_backend is rbd. IMPORTANT: pool must exist before adding
+      ceph-relation.
+  ceph-osd-replication-count:
+    default: 3
+    type: int
+    description: |
+      This value dictates the number of replicas ceph must make of any
+      object it stores withing the nova rbd pool. Of course, this only
+      applies if using Ceph as a backend store. Note that once the nova
+      rbd pool has been created, changing this value will not have any
+      effect (although it can be changed in ceph by manually configuring
+      your ceph cluster).
   sysctl:
     type: string
     default:
 
=== modified file 'hooks/charmhelpers/contrib/storage/linux/ceph.py'
--- hooks/charmhelpers/contrib/storage/linux/ceph.py	2014-12-15 09:10:57 +0000
+++ hooks/charmhelpers/contrib/storage/linux/ceph.py	2014-12-15 10:50:53 +0000
@@ -372,3 +372,46 @@
             return None
     else:
         return None
+
+
+class CephBrokerRq(object):
+    """Ceph broker request.
+
+    Multiple operations can be added to a request and sent to the Ceph broker
+    to be executed.
+
+    Request is json-encoded for sending over the wire.
+
+    The API is versioned and defaults to version 1.
+    """
+    def __init__(self, api_version=1):
+        self.api_version = api_version
+        self.ops = []
+
+    def add_op_create_pool(self, name, replica_count=3):
+        self.ops.append({'op': 'create-pool', 'name': name,
+                         'replicas': replica_count})
+
+    @property
+    def request(self):
+        return json.dumps({'api-version': self.api_version, 'ops': self.ops})
+
+
+class CephBrokerRsp(object):
+    """Ceph broker response.
+
+    Response is json-decoded and contents provided as methods/properties.
+
+    The API is versioned and defaults to version 1.
+    """
+    def __init__(self, encoded_rsp):
+        self.api_version = None
+        self.rsp = json.loads(encoded_rsp)
+
+    @property
+    def exit_code(self):
+        return self.rsp.get('exit-code')
+
+    @property
+    def exit_msg(self):
+        return self.rsp.get('stderr')
 
=== modified file 'hooks/nova_compute_context.py'
--- hooks/nova_compute_context.py	2014-12-03 23:54:27 +0000
+++ hooks/nova_compute_context.py	2014-12-15 10:50:53 +0000
@@ -1,9 +1,6 @@
-
 from charmhelpers.contrib.openstack import context
-
 from charmhelpers.core.host import service_running, service_start
 from charmhelpers.fetch import apt_install, filter_installed_packages
-
 from charmhelpers.core.hookenv import (
     config,
     log,
@@ -14,8 +11,12 @@
     unit_get,
     ERROR,
 )
-
-from charmhelpers.contrib.openstack.utils import get_host_ip, os_release
+from charmhelpers.contrib.openstack.utils import (
+    get_host_ip,
+    os_release,
+    get_os_version_package,
+    get_os_version_codename
+)
 from charmhelpers.contrib.network.ovs import add_bridge
 
 from charmhelpers.contrib.network.ip import (
@@ -30,6 +31,13 @@
 
 OVS_BRIDGE = 'br-int'
 
+CEPH_CONF = '/etc/ceph/ceph.conf'
+CHARM_CEPH_CONF = '/var/lib/charm/{}/ceph.conf'
+
+
+def ceph_config_file():
+    return CHARM_CEPH_CONF.format(service_name())
+
 
 def _save_flag_file(path, data):
     '''
@@ -121,6 +129,17 @@
         return {}
 
 
+def assert_libvirt_imagebackend_allowed():
+    os_rel = "Juno"
+    os_ver = get_os_version_package('nova-compute')
+    if float(os_ver) < float(get_os_version_codename(os_rel.lower())):
+        msg = ("Libvirt RBD imagebackend only supported for openstack >= %s" %
+               os_rel)
+        raise Exception(msg)
+
+    return True
+
+
 class NovaComputeCephContext(context.CephContext):
 
     def __call__(self):
@@ -134,7 +153,14 @@
         ctxt['service_name'] = svc
         ctxt['rbd_user'] = svc
         ctxt['rbd_secret_uuid'] = CEPH_SECRET_UUID
-        ctxt['rbd_pool'] = 'nova'
+        ctxt['rbd_pool'] = config('rbd-pool')
+
+        if (config('libvirt-image-backend') == 'rbd' and
+                assert_libvirt_imagebackend_allowed()):
+            ctxt['libvirt_images_type'] = 'rbd'
+            ctxt['libvirt_rbd_images_ceph_conf'] = ceph_config_file()
+        elif config('libvirt-image-backend') == 'lvm':
+            ctxt['libvirt_images_type'] = 'lvm'
 
         return ctxt
 
 
=== modified file 'hooks/nova_compute_hooks.py'
--- hooks/nova_compute_hooks.py	2014-12-11 20:11:41 +0000
+++ hooks/nova_compute_hooks.py	2014-12-15 10:50:53 +0000
@@ -1,5 +1,4 @@
 #!/usr/bin/python
-
 import sys
 
 from charmhelpers.core.hookenv import (
@@ -7,6 +6,7 @@
     config,
     is_relation_made,
     log,
+    INFO,
     ERROR,
     relation_ids,
     relation_get,
@@ -30,7 +30,11 @@
     openstack_upgrade_available,
 )
 
-from charmhelpers.contrib.storage.linux.ceph import ensure_ceph_keyring
+from charmhelpers.contrib.storage.linux.ceph import (
+    ensure_ceph_keyring,
+    CephBrokerRq,
+    CephBrokerRsp,
+)
 from charmhelpers.payload.execd import execd_preinstall
 from nova_compute_utils import (
     create_libvirt_secret,
@@ -57,9 +61,12 @@
     get_ipv6_addr
 )
 
+from nova_compute_context import (
+    CEPH_SECRET_UUID,
+    assert_libvirt_imagebackend_allowed
+)
 from charmhelpers.core.sysctl import create as create_sysctl
 
-from nova_compute_context import CEPH_SECRET_UUID
 from socket import gethostname
 
 hooks = Hooks()
@@ -231,10 +238,12 @@
     if 'ceph' not in CONFIGS.complete_contexts():
         log('ceph relation incomplete. Peer not ready?')
         return
-    svc = service_name()
-    if not ensure_ceph_keyring(service=svc):
+
+    if not ensure_ceph_keyring(service=service_name(), user='nova',
+                               group='nova'):
         log('Could not create ceph keyring: peer not ready?')
         return
+
     CONFIGS.write(ceph_config_file())
     CONFIGS.write(CEPH_SECRET)
     CONFIGS.write(NOVA_CONF)
@@ -246,6 +255,28 @@
                               secret_uuid=CEPH_SECRET_UUID,
                               key=relation_get('key'))
 
+    if (config('libvirt-image-backend') == 'rbd' and
+            assert_libvirt_imagebackend_allowed()):
+        settings = relation_get()
+        if settings and 'broker_rsp' in settings:
+            rsp = CephBrokerRsp(settings['broker_rsp'])
+            # Non-zero return code implies failure
+            if rsp.exit_code:
+                log("Ceph broker request failed (rc=%s, msg=%s)" %
+                    (rsp.exit_code, rsp.exit_msg), level=ERROR)
+                return
+
+            log("Ceph broker request succeeded (rc=%s, msg=%s)" %
+                (rsp.exit_code, rsp.exit_msg), level=INFO)
+        else:
+            rq = CephBrokerRq()
+            replicas = config('ceph-osd-replication-count')
+            rq.add_op_create_pool(name=config('rbd-pool'),
+                                  replica_count=replicas)
+            for rid in relation_ids('ceph'):
+                relation_set(broker_req=rq.request)
+                log("Request(s) sent to Ceph broker (rid=%s)" % (rid))
+
 
 @hooks.hook('amqp-relation-broken',
             'ceph-relation-broken',
 
=== modified file 'hooks/nova_compute_utils.py'
--- hooks/nova_compute_utils.py	2014-12-03 23:54:27 +0000
+++ hooks/nova_compute_utils.py	2014-12-15 10:50:53 +0000
@@ -23,8 +23,7 @@
     related_units,
     relation_ids,
     relation_get,
-    DEBUG,
-    service_name,
+    DEBUG
 )
 
 from charmhelpers.contrib.openstack.neutron import neutron_plugin_attribute
@@ -43,6 +42,8 @@
     NovaComputeCephContext,
     NeutronComputeContext,
     InstanceConsoleContext,
+    CEPH_CONF,
+    ceph_config_file,
     HostIPContext,
 )
 
@@ -95,8 +96,6 @@
     },
 }
 
-CEPH_CONF = '/etc/ceph/ceph.conf'
-CHARM_CEPH_CONF = '/var/lib/charm/{}/ceph.conf'
 CEPH_SECRET = '/etc/ceph/secret.xml'
 
 CEPH_RESOURCES = {
@@ -150,10 +149,6 @@
 }
 
 
-def ceph_config_file():
-    return CHARM_CEPH_CONF.format(service_name())
-
-
 def resource_map():
     '''
     Dynamically generate a map of resources that will be managed for a single
@@ -198,21 +193,9 @@
         resource_map[NOVA_CONF]['contexts'].append(NeutronComputeContext())
 
     if relation_ids('ceph'):
-        # Add charm ceph configuration to resources and
-        # ensure directory actually exists
-        mkdir(os.path.dirname(ceph_config_file()))
-        mkdir(os.path.dirname(CEPH_CONF))
-        # Install ceph config as an alternative for co-location with
-        # ceph and ceph-osd charms - nova-compute ceph.conf will be
-        # lower priority that both of these but thats OK
-        if not os.path.exists(ceph_config_file()):
-            # touch file for pre-templated generation
-            open(ceph_config_file(), 'w').close()
-        install_alternative(os.path.basename(CEPH_CONF),
-                            CEPH_CONF, ceph_config_file())
         CEPH_RESOURCES[ceph_config_file()] = {
             'contexts': [NovaComputeCephContext()],
-            'services': [],
+            'services': ['nova-compute']
         }
         resource_map.update(CEPH_RESOURCES)
 
@@ -243,6 +226,20 @@
     configs = templating.OSConfigRenderer(templates_dir=TEMPLATES,
                                           openstack_release=release)
 
+    if relation_ids('ceph'):
+        # Add charm ceph configuration to resources and
+        # ensure directory actually exists
+        mkdir(os.path.dirname(ceph_config_file()))
+        mkdir(os.path.dirname(CEPH_CONF))
+        # Install ceph config as an alternative for co-location with
+        # ceph and ceph-osd charms - nova-compute ceph.conf will be
+        # lower priority that both of these but thats OK
+        if not os.path.exists(ceph_config_file()):
+            # touch file for pre-templated generation
+            open(ceph_config_file(), 'w').close()
+        install_alternative(os.path.basename(CEPH_CONF),
+                            CEPH_CONF, ceph_config_file())
+
     for cfg, d in resource_map().iteritems():
         configs.register(cfg, d['contexts'])
     return configs
 
=== modified file 'revision'
--- revision	2014-03-27 11:08:20 +0000
+++ revision	2014-12-15 10:50:53 +0000
@@ -1,1 +1,1 @@
-132
+133
 
=== modified file 'templates/havana/nova.conf'
--- templates/havana/nova.conf	2014-12-03 23:23:54 +0000
+++ templates/havana/nova.conf	2014-12-15 10:50:53 +0000
@@ -31,12 +31,6 @@
 glance_api_servers = {{ glance_api_servers }}
 {% endif -%}
 
-{% if rbd_pool -%}
-rbd_pool = {{ rbd_pool }}
-rbd_user = {{ rbd_user }}
-rbd_secret_uuid = {{ rbd_secret_uuid }}
-{% endif -%}
-
 {% if console_vnc_type -%}
 vnc_enabled = True
 novnc_enabled = True
@@ -116,7 +110,21 @@
 server_proxyclient_address = {{ console_listen_addr }}
 {% endif -%}
 
+[libvirt]
+{% if libvirt_images_type -%}
+images_type = {{ libvirt_images_type }}
+images_rbd_pool = {{ rbd_pool }}
+images_rbd_ceph_conf = {{ libvirt_rbd_images_ceph_conf }}
+inject_password=false
+inject_key=false
+inject_partition=-2
+{% endif -%}
+{% if rbd_pool -%}
+rbd_pool = {{ rbd_pool }}
+rbd_user = {{ rbd_user }}
+rbd_secret_uuid = {{ rbd_secret_uuid }}
+{% endif -%}
 {% if disk_cachemodes -%}
-[libvirt]
 disk_cachemodes = {{ disk_cachemodes }}
 {% endif -%}
+
 
=== modified file 'templates/juno/nova.conf'
--- templates/juno/nova.conf	2014-12-03 23:23:54 +0000
+++ templates/juno/nova.conf	2014-12-15 10:50:53 +0000
@@ -107,6 +107,14 @@
 {% endif -%}
 
 [libvirt]
+{% if libvirt_images_type -%}
+images_type = {{ libvirt_images_type }}
+images_rbd_pool = {{ rbd_pool }}
+images_rbd_ceph_conf = {{ libvirt_rbd_images_ceph_conf }}
+inject_password=false
+inject_key=false
+inject_partition=-2
+{% endif -%}
 {% if rbd_pool -%}
 rbd_pool = {{ rbd_pool }}
 rbd_user = {{ rbd_user }}
 
=== modified file 'unit_tests/test_nova_compute_hooks.py'
--- unit_tests/test_nova_compute_hooks.py	2014-12-11 20:11:41 +0000
+++ unit_tests/test_nova_compute_hooks.py	2014-12-15 10:50:53 +0000
@@ -1,19 +1,15 @@
-from mock import call, patch, MagicMock
+from mock import (
+    call,
+    patch,
+    MagicMock
+)
 
 from test_utils import CharmTestCase
 
-import nova_compute_utils as utils
-
-_reg = utils.register_configs
-_map = utils.restart_map
-
-utils.register_configs = MagicMock()
-utils.restart_map = MagicMock()
-
-import nova_compute_hooks as hooks
-
-utils.register_configs = _reg
-utils.restart_map = _map
+with patch("nova_compute_utils.restart_map"):
+    with patch("nova_compute_utils.register_configs"):
+        import nova_compute_hooks as hooks
+
 
 TO_PATCH = [
     # charmhelpers.core.hookenv
@@ -59,17 +55,14 @@
 ]
 
 
-def fake_filter(packages):
-    return packages
-
-
 class NovaComputeRelationsTests(CharmTestCase):
 
     def setUp(self):
         super(NovaComputeRelationsTests, self).setUp(hooks,
                                                      TO_PATCH)
         self.config.side_effect = self.test_config.get
-        self.filter_installed_packages.side_effect = fake_filter
+        self.filter_installed_packages.side_effect = \
+            MagicMock(side_effect=lambda pkgs: pkgs)
         self.gethostname.return_value = 'testserver'
 
     def test_install_hook(self):
@@ -368,7 +361,7 @@
             'Could not create ceph keyring: peer not ready?'
         )
 
-    @patch.object(utils, 'service_name')
+    @patch('nova_compute_context.service_name')
     @patch.object(hooks, 'CONFIGS')
     def test_ceph_changed_with_key_and_relation_data(self, configs,
                                                      service_name):
 
=== modified file 'unit_tests/test_nova_compute_utils.py'
--- unit_tests/test_nova_compute_utils.py	2014-11-28 14:17:10 +0000
+++ unit_tests/test_nova_compute_utils.py	2014-12-15 10:50:53 +0000
@@ -1,10 +1,18 @@
-from mock import patch, MagicMock, call
-
-from test_utils import CharmTestCase, patch_open
-
+import itertools
+import tempfile
 
 import nova_compute_utils as utils
-import itertools
+
+from mock import (
+    patch,
+    MagicMock,
+    call
+)
+from test_utils import (
+    CharmTestCase,
+    patch_open
+)
+
 
 TO_PATCH = [
     'config',
@@ -14,7 +22,6 @@
     'related_units',
     'relation_ids',
     'relation_get',
-    'service_name',
     'mkdir',
     'install_alternative'
 ]
@@ -32,7 +39,6 @@
     def setUp(self):
         super(NovaComputeUtilsTests, self).setUp(utils, TO_PATCH)
         self.config.side_effect = self.test_config.get
-        self.service_name.return_value = 'nova-compute'
 
     @patch.object(utils, 'network_manager')
     def test_determine_packages_nova_network(self, net_man):
@@ -271,10 +277,12 @@
             _file.write.assert_called_with('foo_cert\n')
         check_call.assert_called_with(['update-ca-certificates'])
 
+    @patch.object(utils, 'ceph_config_file')
     @patch('charmhelpers.contrib.openstack.templating.OSConfigRenderer')
     @patch.object(utils, 'quantum_enabled')
     @patch.object(utils, 'resource_map')
-    def test_register_configs(self, resource_map, quantum, renderer):
+    def test_register_configs(self, resource_map, quantum, renderer,
+                              mock_ceph_config_file):
         quantum.return_value = False
         self.os_release.return_value = 'havana'
         fake_renderer = MagicMock()
@@ -293,14 +301,16 @@
             },
         }
         resource_map.return_value = rsc_map
-        utils.register_configs()
-        renderer.assert_called_with(
-            openstack_release='havana', templates_dir='templates/')
-        ex_reg = [
-            call('/etc/nova/nova-compute.conf', [ctxt2]),
-            call('/etc/nova/nova.conf', [ctxt1])
-        ]
-        self.assertEquals(fake_renderer.register.call_args_list, ex_reg)
+        with tempfile.NamedTemporaryFile() as tmpfile:
+            mock_ceph_config_file.return_value = tmpfile.name
+            utils.register_configs()
+            renderer.assert_called_with(
+                openstack_release='havana', templates_dir='templates/')
+            ex_reg = [
+                call('/etc/nova/nova-compute.conf', [ctxt2]),
+                call('/etc/nova/nova.conf', [ctxt1])
+            ]
+            self.assertEquals(fake_renderer.register.call_args_list, ex_reg)
 
     @patch.object(utils, 'check_call')
     def test_enable_shell(self, _check_call):