Merge lp:~hopem/charms/trusty/nova-compute/fix-missing-default into lp:~openstack-charmers-archive/charms/trusty/nova-compute/next

[Edward Hope-Morley]

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

charm_lint_check #1830 nova-compute-next for hopem mp249100
    LINT OK: passed

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

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

charm_unit_test #1658 nova-compute-next for hopem mp249100
    UNIT OK: passed

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

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

charm_amulet_test #1849 nova-compute-next for hopem mp249100
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
  ERROR subprocess encountered error code 1
  make: *** [test] Error 1

Full amulet test output: http://paste.ubuntu.com/10146422/
Build: http://10.245.162.77:8080/job/charm_amulet_test/1849/

[Liam Young (gnuoy)]

Approve

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2014-12-15 11:38:06 +0000
+++ config.yaml	2015-02-09 18:16:36 +0000
@@ -124,7 +124,7 @@
       this allows you to differentiate between them.
   disable-neutron-security-groups:
     type: boolean
-    default:
+    default: False
     description: |
       Disable neutron based security groups - setting this configuration option
       will override any settings configured via the nova-cloud-controller charm.

=== modified file 'hooks/nova_compute_context.py'
--- hooks/nova_compute_context.py	2014-12-15 10:28:47 +0000
+++ hooks/nova_compute_context.py	2015-02-09 18:16:36 +0000
@@ -421,9 +421,9 @@
     def __call__(self):
         ctxt = super(NeutronComputeContext, self).__call__()
         # NOTE(jamespage) support override of neutron security via config
-        if config('disable-neutron-security-groups') is not None:
-            ctxt['disable_neutron_security_groups'] = \
-                config('disable-neutron-security-groups')
+        if config('disable-neutron-security-groups'):
+            ctxt['disable_neutron_security_groups'] = True
+
         return ctxt
 
 

=== modified file 'unit_tests/test_nova_compute_contexts.py'
--- unit_tests/test_nova_compute_contexts.py	2014-12-03 23:23:54 +0000
+++ unit_tests/test_nova_compute_contexts.py	2015-02-09 18:16:36 +0000
@@ -202,8 +202,7 @@
         self.test_config.set('disable-neutron-security-groups', False)
         qplugin = context.NeutronComputeContext()
         with patch.object(qplugin, '_ensure_packages'):
-            self.assertEquals({'disable_neutron_security_groups': False},
-                              qplugin())
+            self.assertEquals({}, qplugin())
 
     @patch('subprocess.call')
     def test_host_IP_context(self, _call):