Merge lp:~james-page/charms/trusty/nova-cloud-controller/bug.1391784 into lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next

[James Page]

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_lint_check #1005 nova-cloud-controller-next for james-page mp241525
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option haproxy-client-timeout has no default value
  I: config.yaml: option ssl_cert has no default value
  I: config.yaml: option nvp-l3-uuid has no default value
  I: config.yaml: option os-internal-network has no default value
  I: config.yaml: option nvp-controllers has no default value

Full lint test output: http://paste.ubuntu.com/8961144/
Build: http://10.98.191.181:8080/job/charm_lint_check/1005/

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_unit_test #840 nova-cloud-controller-next for james-page mp241525
    UNIT OK: passed

UNIT Results (max last 5 lines):
  hooks/nova_cc_hooks 443 126 72% 132-135, 148-149, 173, 184-185, 189, 221, 226-231, 242, 322-325, 333-336, 342-345, 355-371, 380-382, 392-406, 410-419, 505, 515, 519-520, 573, 579-589, 594-605, 615-625, 641-642, 683-698, 706-710, 735-744, 768, 773-781, 807, 857-860
  hooks/nova_cc_utils 447 112 75% 296-301, 312-315, 325-326, 382, 384, 430-432, 436, 450-458, 465-470, 474-488, 548, 597-599, 604-607, 612, 616, 640-641, 655-657, 678-679, 685-708, 712-718, 722-728, 734, 740, 747, 758-762, 847, 907-913, 917-919, 923-926, 930-942
  TOTAL 1041 347 67%
  Ran 97 tests in 9.644s
  OK

Full unit test output: http://paste.ubuntu.com/8961150/
Build: http://10.98.191.181:8080/job/charm_unit_test/840/

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_amulet_test #385 nova-cloud-controller-next for james-page mp241525
    AMULET OK: passed

AMULET Results (max last 5 lines):
  juju-test.conductor DEBUG : Calling "juju destroy-environment -y osci-sv04"
  WARNING cannot delete security group "juju-osci-sv04-0". Used by another environment?
  WARNING cannot delete security group "juju-osci-sv04". Used by another environment?
  WARNING cannot delete security group "juju-osci-sv04-0". Used by another environment?
  juju-test INFO : Results: 3 passed, 0 failed, 0 errored

Full amulet test output: http://paste.ubuntu.com/8961383/
Build: http://10.98.191.181:8080/job/charm_amulet_test/385/

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

UOSCI bot says:
charm_lint_check #1079 nova-cloud-controller-next for james-page mp241525
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option haproxy-client-timeout has no default value
  I: config.yaml: option ssl_cert has no default value
  I: config.yaml: option nvp-l3-uuid has no default value
  I: config.yaml: option os-internal-network has no default value
  I: config.yaml: option nvp-controllers has no default value

Full lint test output: http://paste.ubuntu.com/9044320/
Build: http://10.98.191.181:8080/job/charm_lint_check/1079/

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

UOSCI bot says:
charm_unit_test #913 nova-cloud-controller-next for james-page mp241525
    UNIT OK: passed

UNIT Results (max last 5 lines):
  hooks/nova_cc_hooks 443 126 72% 132-135, 148-149, 173, 184-185, 189, 221, 226-231, 242, 322-325, 333-336, 342-345, 355-371, 380-382, 392-406, 410-419, 505, 515, 519-520, 573, 579-589, 594-605, 615-625, 641-642, 683-698, 706-710, 735-744, 768, 773-781, 807, 857-860
  hooks/nova_cc_utils 447 112 75% 296-301, 312-315, 325-326, 382, 384, 430-432, 436, 450-458, 465-470, 474-488, 548, 597-599, 604-607, 612, 616, 640-641, 655-657, 678-679, 685-708, 712-718, 722-728, 734, 740, 747, 758-762, 847, 907-913, 917-919, 923-926, 930-942
  TOTAL 1041 347 67%
  Ran 97 tests in 9.171s
  OK

Full unit test output: http://paste.ubuntu.com/9044322/
Build: http://10.98.191.181:8080/job/charm_unit_test/913/

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

UOSCI bot says:
charm_amulet_test #421 nova-cloud-controller-next for james-page mp241525
    AMULET OK: passed

AMULET Results (max last 5 lines):
  juju-test.conductor.15-basic-trusty-icehouse RESULT :
  juju-test.conductor DEBUG : Tearing down osci-sv02 juju environment
  juju-test.conductor DEBUG : Calling "juju destroy-environment -y osci-sv02"
  WARNING cannot delete security group "juju-osci-sv02-0". Used by another environment?
  juju-test INFO : Results: 3 passed, 0 failed, 0 errored

Full amulet test output: http://paste.ubuntu.com/9044577/
Build: http://10.98.191.181:8080/job/charm_amulet_test/421/

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

UOSCI bot says:
charm_lint_check #1158 nova-cloud-controller-next for james-page mp241525
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option haproxy-client-timeout has no default value
  I: config.yaml: option ssl_cert has no default value
  I: config.yaml: option nvp-l3-uuid has no default value
  I: config.yaml: option os-internal-network has no default value
  I: config.yaml: option nvp-controllers has no default value

Full lint test output: http://paste.ubuntu.com/9126505/
Build: http://10.98.191.181:8080/job/charm_lint_check/1158/

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

UOSCI bot says:
charm_unit_test #992 nova-cloud-controller-next for james-page mp241525
    UNIT OK: passed

UNIT Results (max last 5 lines):
  hooks/nova_cc_hooks 443 126 72% 132-135, 148-149, 173, 184-185, 189, 221, 226-231, 242, 322-325, 333-336, 342-345, 355-371, 380-382, 392-406, 410-419, 505, 515, 519-520, 573, 579-589, 594-605, 615-625, 641-642, 683-698, 706-710, 735-744, 768, 773-781, 807, 857-860
  hooks/nova_cc_utils 447 112 75% 296-301, 312-315, 325-326, 382, 384, 430-432, 436, 450-458, 465-470, 474-488, 548, 597-599, 604-607, 612, 616, 640-641, 655-657, 678-679, 685-708, 712-718, 722-728, 734, 740, 747, 758-762, 847, 907-913, 917-919, 923-926, 930-942
  TOTAL 1041 347 67%
  Ran 97 tests in 9.603s
  OK

Full unit test output: http://paste.ubuntu.com/9126520/
Build: http://10.98.191.181:8080/job/charm_unit_test/992/

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

UOSCI bot says:
charm_amulet_test #500 nova-cloud-controller-next for james-page mp241525
    AMULET FAIL: amulet-test failed

AMULET Results (max last 5 lines):
  ERROR waited for 10m0s without being able to connect: ssh: connect to host 10.212.2.249 port 22: No route to host
  juju-test.conductor WARNING : Could not bootstrap osci-sv02, got Bootstrap returned with an exit > 0. Skipping
  juju-test INFO : Results: 1 passed, 1 failed, 1 errored
  ERROR subprocess encountered error code 1
  make: *** [test] Error 1

Full amulet test output: http://paste.ubuntu.com/9127032/
Build: http://10.98.191.181:8080/job/charm_amulet_test/500/

[Liam Young (gnuoy)]

Approve

review: Approve

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

charm_lint_check #730 nova-cloud-controller-next for james-page mp241525
    LINT OK: passed

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

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

charm_unit_test #759 nova-cloud-controller-next for james-page mp241525
    UNIT OK: passed

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

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

charm_amulet_test #915 nova-cloud-controller-next for james-page mp241525
    AMULET OK: passed

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

[Ryan Beisner (1chb1n)]

FYI P, T & U deploy tests are good!

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2014-10-30 03:30:36 +0000
+++ config.yaml	2015-01-13 14:45:13 +0000
@@ -103,6 +103,18 @@
       .
       If multiple networks are being used, a VIP should be provided for each
       network, separated by spaces.
+  vip_iface:
+    type: string
+    default: eth0
+    description: |
+      Default network interface to use for HA vip when it cannot be automatically
+      determined.
+  vip_cidr:
+    type: int
+    default: 24
+    description: |
+      Default CIDR netmask to use for HA vip when it cannot be automatically
+      determined.
   ha-bindiface:
     type: string
     default: eth0

=== modified file 'hooks/nova_cc_hooks.py'
--- hooks/nova_cc_hooks.py	2015-01-12 12:04:00 +0000
+++ hooks/nova_cc_hooks.py	2015-01-13 14:45:13 +0000
@@ -648,7 +648,11 @@
             res_nova_vip = 'ocf:heartbeat:IPaddr2'
             vip_params = 'ip'
 
-        iface = get_iface_for_address(vip)
+        iface = (get_iface_for_address(vip) or
+                 config('vip_iface'))
+        netmask = (get_netmask_for_address(vip) or
+                   config('vip_cidr'))
+
         if iface is not None:
             vip_key = 'res_nova_{}_vip'.format(iface)
             resources[vip_key] = res_nova_vip
@@ -657,7 +661,7 @@
                 ' nic="{iface}"'.format(ip=vip_params,
                                         vip=vip,
                                         iface=iface,
-                                        netmask=get_netmask_for_address(vip))
+                                        netmask=netmask)
             )
             vip_group.append(vip_key)
 

=== modified file 'unit_tests/test_nova_cc_hooks.py'
--- unit_tests/test_nova_cc_hooks.py	2015-01-12 14:23:34 +0000
+++ unit_tests/test_nova_cc_hooks.py	2015-01-13 14:45:13 +0000
@@ -64,6 +64,9 @@
     'migrate_nova_database',
     'migrate_neutron_database',
     'uuid',
+    'get_hacluster_config',
+    'get_iface_for_address',
+    'get_netmask_for_address',
     'update_nrpe_config',
 ]
 
@@ -607,3 +610,31 @@
             'Not running neutron database migration as migrations are handled'
             'by the neutron-server process.'
         )
+
+    def test_ha_relation_joined_no_bound_ip(self):
+        self.get_hacluster_config.return_value = {
+            'ha-bindiface': 'em0',
+            'ha-mcastport': '8080',
+            'vip': '10.10.10.10',
+        }
+        self.test_config.set('vip_iface', 'eth120')
+        self.test_config.set('vip_cidr', '21')
+        self.get_iface_for_address.return_value = None
+        self.get_netmask_for_address.return_value = None
+        hooks.ha_joined()
+        args = {
+            'corosync_bindiface': 'em0',
+            'corosync_mcastport': '8080',
+            'init_services': {'res_nova_haproxy': 'haproxy'},
+            'resources': {'res_nova_eth120_vip': 'ocf:heartbeat:IPaddr2',
+                          'res_nova_haproxy': 'lsb:haproxy'},
+            'resource_params': {
+                'res_nova_eth120_vip': 'params ip="10.10.10.10"'
+                ' cidr_netmask="21" nic="eth120"',
+                'res_nova_haproxy': 'op monitor interval="5s"'},
+            'clones': {'cl_nova_haproxy': 'res_nova_haproxy'}
+        }
+        self.relation_set.assert_has_calls([
+            call(groups={'grp_nova_vips': 'res_nova_eth120_vip'}),
+            call(**args),
+        ])