Merge lp:~niedbalski/charms/trusty/nova-compute/fix-lp-1518001 into lp:~openstack-charmers-archive/charms/trusty/nova-compute/next

[Jorge Niedbalski]

Dear Maintainer,

This is a fix for LP: #1518001 ,

- Adds the LibvirtConfigFlags context
- Adds a new configuration parameter (libvirt-flags) which
adds entries into the [libvirt] section of the nova.conf file.
- Adds unit tests for validate.

[James Page (james-page)]

Question - what's the context for configuring this libvirt section option?

Is this required when deploying with a certain set of charms? If so we should not rely on configuration options on the charm todo this sort of thing.

review: Needs Fixing

[James Page (james-page)]

Sorry that was mean't to be 'Needs Information'

review: Needs Information

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

charm_lint_check #14135 nova-compute-next for niedbalski mp278060
    LINT OK: passed

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

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

charm_unit_test #13175 nova-compute-next for niedbalski mp278060
    UNIT OK: passed

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

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

charm_amulet_test #7955 nova-compute-next for niedbalski mp278060
    AMULET OK: passed

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

Unmerged revisions

185. By Jorge Niedbalski on 2015-11-20

Added unit tests

184. By Jorge Niedbalski on 2015-11-19

Fix for LP: #1518001

=== modified file 'config.yaml'
--- config.yaml	2015-10-09 15:02:40 +0000
+++ config.yaml	2015-11-20 13:14:10 +0000
@@ -116,6 +116,12 @@
     description: |
       Comma-separated list of key=value config flags. These values will be
       placed in the nova.conf [DEFAULT] section.
+  libvirt-flags:
+    type: string
+    default:
+    description: |
+      Comma-separated list of key=value config flags. These values will be
+      placed in the nova.conf [libvirt] section.
   database-user:
     type: string
     default: nova
@@ -215,17 +221,17 @@
     type: string
     default:
     description: |
-      Set to 'host-model' to clone the host CPU feature flags; to 
-      'host-passthrough' to use the host CPU model exactly; to 'custom' to 
-      use a named CPU model; to 'none' to not set any CPU model. If 
-      virt_type='kvm|qemu', it will default to 'host-model', otherwise it will 
+      Set to 'host-model' to clone the host CPU feature flags; to
+      'host-passthrough' to use the host CPU model exactly; to 'custom' to
+      use a named CPU model; to 'none' to not set any CPU model. If
+      virt_type='kvm|qemu', it will default to 'host-model', otherwise it will
       default to 'none'.
   cpu-model:
     type: string
     default:
     description: |
-      Set to a named libvirt CPU model (see names listed in 
-      /usr/share/libvirt/cpu_map.xml). Only has effect if cpu_mode='custom' and 
+      Set to a named libvirt CPU model (see names listed in
+      /usr/share/libvirt/cpu_map.xml). Only has effect if cpu_mode='custom' and
       virt_type='kvm|qemu'.
   # Storage configuration options
   libvirt-image-backend:
 
=== modified file 'hooks/charmhelpers/contrib/openstack/context.py'
--- hooks/charmhelpers/contrib/openstack/context.py	2015-10-22 15:16:40 +0000
+++ hooks/charmhelpers/contrib/openstack/context.py	2015-11-20 13:14:10 +0000
@@ -1088,6 +1088,20 @@
                 config_flags_parser(config_flags)}
 
 
+class LibvirtConfigFlagsContext(OSContextGenerator):
+    """
+    This context provides support for extending
+    the libvirt section through user-defined flags.
+    """
+    def __call__(self):
+        ctxt = {}
+        libvirt_flags = config('libvirt-flags')
+        if libvirt_flags:
+            ctxt['libvirt_flags'] = config_flags_parser(
+                libvirt_flags)
+        return ctxt
+
+
 class SubordinateConfigContext(OSContextGenerator):
 
     """
 
=== modified file 'hooks/nova_compute_utils.py'
--- hooks/nova_compute_utils.py	2015-10-30 05:49:18 +0000
+++ hooks/nova_compute_utils.py	2015-11-20 13:14:10 +0000
@@ -178,7 +178,8 @@
                      context.NotificationDriverContext(),
                      MetadataServiceContext(),
                      HostIPContext(),
-                     context.LogLevelContext()],
+                     context.LogLevelContext(),
+                     context.LibvirtConfigFlagsContext()],
     },
 }
 
 
=== modified file 'templates/havana/nova.conf'
--- templates/havana/nova.conf	2015-09-25 14:58:23 +0000
+++ templates/havana/nova.conf	2015-11-20 13:14:10 +0000
@@ -128,6 +128,11 @@
 {% endif -%}
 
 [libvirt]
+{% if libvirt_flags -%}
+{% for key, value in libvirt_flags.iteritems() -%}
+{{ key }} = {{ value }}
+{% endfor -%}
+{% endif -%}
 {% if cpu_mode -%}
 cpu_mode = {{ cpu_mode }}
 {% endif -%}
@@ -150,4 +155,3 @@
 {% if disk_cachemodes -%}
 disk_cachemodes = {{ disk_cachemodes }}
 {% endif -%}
-
 
=== modified file 'templates/icehouse/nova.conf'
--- templates/icehouse/nova.conf	2015-09-25 14:58:23 +0000
+++ templates/icehouse/nova.conf	2015-11-20 13:14:10 +0000
@@ -146,6 +146,12 @@
 {% endif -%}
 
 [libvirt]
+{% if libvirt_flags -%}
+{% for key, value in libvirt_flags.iteritems() -%}
+{{ key }} = {{ value }}
+{% endfor -%}
+{% endif -%}
+
 {% if cpu_mode -%}
 cpu_mode = {{ cpu_mode }}
 {% endif -%}
@@ -168,4 +174,3 @@
 {% if disk_cachemodes -%}
 disk_cachemodes = {{ disk_cachemodes }}
 {% endif -%}
-
 
=== modified file 'templates/juno/nova.conf'
--- templates/juno/nova.conf	2015-10-14 14:08:38 +0000
+++ templates/juno/nova.conf	2015-11-20 13:14:10 +0000
@@ -142,6 +142,11 @@
 {% endif -%}
 
 [libvirt]
+{% if libvirt_flags -%}
+{% for key, value in libvirt_flags.iteritems() -%}
+{{ key }} = {{ value }}
+{% endfor -%}
+{% endif -%}
 {% if cpu_mode -%}
 cpu_mode = {{ cpu_mode }}
 {% endif -%}
 
=== modified file 'templates/kilo/nova.conf'
--- templates/kilo/nova.conf	2015-11-04 16:06:18 +0000
+++ templates/kilo/nova.conf	2015-11-20 13:14:10 +0000
@@ -150,6 +150,13 @@
 {% endif -%}
 
 [libvirt]
+
+{% if libvirt_flags -%}
+{% for key, value in libvirt_flags.iteritems() -%}
+{{ key }} = {{ value }}
+{% endfor -%}
+{% endif -%}
+
 {% if cpu_mode -%}
 cpu_mode = {{ cpu_mode }}
 {% endif -%}
 
=== modified file 'unit_tests/test_nova_compute_utils.py'
--- unit_tests/test_nova_compute_utils.py	2015-10-30 05:49:18 +0000
+++ unit_tests/test_nova_compute_utils.py	2015-11-20 13:14:10 +0000
@@ -1,5 +1,6 @@
 import itertools
 import tempfile
+import charmhelpers.contrib.openstack as helpers
 
 import nova_compute_context as compute_context
 import nova_compute_utils as utils
@@ -394,6 +395,27 @@
             ]
             self.assertEquals(fake_renderer.register.call_args_list, ex_reg)
 
+    @patch('charmhelpers.contrib.openstack.context.config')
+    def test_register_configs_libvirt(self, config):
+        self.relation_ids.return_value = []
+
+        def _get_libvirt_ctxt(contexts):
+            for context in contexts:
+                if isinstance(context,
+                              helpers.context.LibvirtConfigFlagsContext):
+                    return context
+            return None
+
+        config.return_value = "iscsi_use_multipath=True, iscsi_foo=False"
+        context = _get_libvirt_ctxt(
+            utils.resource_map()['/etc/nova/nova.conf']['contexts'])
+
+        self.assertNotEquals(context, None)
+        self.assertEquals(context(), {'libvirt_flags': {
+            'iscsi_use_multipath': 'True',
+            'iscsi_foo': 'False',
+        }})
+
     @patch.object(utils, 'check_call')
     def test_enable_shell(self, _check_call):
         utils.enable_shell('dummy')