Merge lp:~gnuoy/charms/trusty/nova-compute/cell-support into lp:~openstack-charmers-archive/charms/trusty/nova-compute/next

[Liam Young]

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_lint_check #749 nova-compute-next for gnuoy mp239357
    LINT OK: believed to pass, but you should confirm results

LINT Results (max last 4 lines) from
/var/lib/jenkins/workspace/charm_lint_check/make-lint.749:
I: config.yaml: option config-flags has no default value
I: config.yaml: option instances-path has no default value
W: config.yaml: option disable-neutron-security-groups has no default value
I: config.yaml: option migration-auth-type has no default value

Full lint output: http://paste.ubuntu.com/8651864/
Build: http://10.98.191.181:8080/job/charm_lint_check/749/

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_unit_test #557 nova-compute-next for gnuoy mp239357
    UNIT OK: believed to pass, but you should confirm results

UNIT Results (max last 4 lines) from
/var/lib/jenkins/workspace/charm_unit_test/unit-test.557:
----------------------------------------------------------------------
Ran 57 tests in 3.145s

OK (SKIP=5)

Full unit output: http://paste.ubuntu.com/8651865/
Build: http://10.98.191.181:8080/job/charm_unit_test/557/

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_amulet_test #302 nova-compute-next for gnuoy mp239357
    AMULET OK: believed to pass, but you should confirm results

AMULET Results (max last 4 lines) from
/var/lib/jenkins/workspace/charm_amulet_test/make-test.302:
juju-test.conductor DEBUG : Tearing down osci-sv05 juju environment
juju-test.conductor DEBUG : Calling "juju destroy-environment -y osci-sv05"
WARNING cannot delete security group "juju-osci-sv05-0". Used by another environment?
juju-test INFO : Results: 3 passed, 0 failed, 0 errored

Full amulet output: http://paste.ubuntu.com/8652045/
Build: http://10.98.191.181:8080/job/charm_amulet_test/302/

[James Page (james-page)]

review: Needs Fixing

Unmerged revisions

81. By Liam Young on 2014-10-23

Add vif unit_test

80. By Liam Young on 2014-10-23

Simplified vif plugin setup

79. By Liam Young on 2014-10-23

Remove hardcoded debug=True from havana template

78. By Liam Young on 2014-10-23

Tidy lint

77. By Liam Young on 2014-10-23

Add vif setting to juno template

76. By Liam Young on 2014-10-23

Merged next in

75. By Liam Young on 2014-10-07

Merged next in

74. By Liam Young on 2014-09-02

Rebased

73. By Liam Young on 2014-07-24

Default debug on

72. By Liam Young on 2014-07-23

Fix typo in nova template and allow vif_plugging_timeout to be toggled off

=== modified file 'config.yaml'
--- config.yaml	2014-09-25 16:43:39 +0000
+++ config.yaml	2014-10-23 14:10:22 +0000
@@ -127,6 +127,13 @@
       .
       This network will be used for tenant network traffic in overlay
       networks.
+  vif-plugging-timeout:
+    type: int
+    default: 
+    description: |
+      Setting this > 0 tells nova how long to wait for a vif plugin
+      notification from neutron, a lack of response also stops being fatal.
+      It is currently needed for cell deployments due to Bug#1348103.
   prefer-ipv6:
     type: boolean
     default: False

=== modified file 'hooks/nova_compute_context.py'
--- hooks/nova_compute_context.py	2014-09-30 20:33:51 +0000
+++ hooks/nova_compute_context.py	2014-10-23 14:10:22 +0000
@@ -310,6 +310,9 @@
 
         if self.restart_trigger():
             ctxt['restart_trigger'] = self.restart_trigger()
+        if config('vif-plugging-timeout') and \
+                config('vif-plugging-timeout') > 0:
+            ctxt['vif_plugging_timeout'] = config('vif-plugging-timeout')
         return ctxt
 
 

=== modified file 'templates/havana/nova.conf'
--- templates/havana/nova.conf	2014-07-31 15:32:21 +0000
+++ templates/havana/nova.conf	2014-10-23 14:10:22 +0000
@@ -99,6 +99,11 @@
 instances_path = {{ instances_path }}
 {% endif -%}
 
+{% if vif_plugging_timeout -%}
+vif_plugging_is_fatal = False
+vif_plugging_timeout = {{ vif_plugging_timeout }}
+{% endif -%}
+
 {% if sections and 'DEFAULT' in sections -%}
 {% for key, value in sections['DEFAULT'] -%}
 {{ key }} = {{ value }}

=== modified file 'templates/juno/nova.conf'
--- templates/juno/nova.conf	2014-10-14 13:20:36 +0000
+++ templates/juno/nova.conf	2014-10-23 14:10:22 +0000
@@ -89,6 +89,11 @@
 instances_path = {{ instances_path }}
 {% endif -%}
 
+{% if vif_plugging_timeout -%}
+vif_plugging_is_fatal = Fatal
+vif_plugging_timeout = {{ vif_plugging_timeout }}
+{% endif -%}
+
 {% if sections and 'DEFAULT' in sections -%}
 {% for key, value in sections['DEFAULT'] -%}
 {{ key }} = {{ value }}

=== modified file 'unit_tests/test_nova_compute_contexts.py'
--- unit_tests/test_nova_compute_contexts.py	2014-07-14 13:24:51 +0000
+++ unit_tests/test_nova_compute_contexts.py	2014-10-23 14:10:22 +0000
@@ -102,6 +102,16 @@
         self.assertEquals({'volume_service': 'nova-volume'}, cloud_compute())
 
     @patch.object(context, '_network_manager')
+    def test_cloud_compute_volume_context_vif(self, netman):
+        netman.return_value = None
+        self.test_config.set('vif-plugging-timeout', '10')
+        self.relation_ids.return_value = 'cloud-compute:0'
+        self.related_units.return_value = 'nova-cloud-controller/0'
+        cloud_compute = context.CloudComputeContext()
+        self.os_release.return_value = 'juno'
+        self.assertEquals({'vif_plugging_timeout': '10'}, cloud_compute())
+
+    @patch.object(context, '_network_manager')
     def test_cloud_compute_volume_context_nova_vol_unsupported(self, netman):
         self.skipTest('TODO')
         netman.return_value = None