Merge lp:~james-page/charms/trusty/nova-compute/disable-neutron-security-option into lp:~openstack-charmers-archive/charms/trusty/nova-compute/trunk

[James Page]

Add option to allow the nova-compute charm to override neutron security group configuration provided from the nova-cloud-controller.

[lp:~james-page/charms/trusty/nova-compute/disable-neutron-security-option]

65. By James Page on 2014-06-02

Do the disable a different way

66. By James Page on 2014-06-02

Put disable in the right place

67. By James Page on 2014-06-02

Add big warning

68. By James Page on 2014-07-14

Tidy lint, add unit tests

69. By James Page on 2014-07-14

Tidy test a bit

Unmerged revisions

=== modified file 'config.yaml'
--- config.yaml	2014-03-31 15:24:56 +0000
+++ config.yaml	2014-06-02 15:40:29 +0000
@@ -105,3 +105,8 @@
           juju-myservice-0
       If you're running multiple environments with the same services in them
       this allows you to differentiate between them.
+  disable-neutron-security-groups:
+    type: boolean
+    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-04-04 16:45:38 +0000
+++ hooks/nova_compute_context.py	2014-06-02 15:40:29 +0000
@@ -48,6 +48,9 @@
         Inspects current cloud-compute relation and determine if nova-c-c has
         instructed us to use neutron security groups.
         '''
+        # NOTE(jamespage) support override of neutron security via config
+        if config('disable-neutron-security-groups') is not None:
+            return not config('disable-neutron-security-groups')
         for rid in relation_ids('cloud-compute'):
             for unit in related_units(rid):
                 groups = [