Merge lp:~gnuoy/charms/trusty/cinder/bug1403132 into lp:~openstack-charmers-archive/charms/trusty/cinder/next

[Liam Young]

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

charm_lint_check #942 cinder-next for gnuoy mp247153
    LINT OK: passed

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

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

charm_unit_test #971 cinder-next for gnuoy mp247153
    UNIT OK: passed

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

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

charm_amulet_test #1164 cinder-next for gnuoy mp247153
    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/9806533/
Build: http://10.245.162.77:8080/job/charm_amulet_test/1164/

[Ryan Beisner (1chb1n)]

FYI, all deploy tests are happy. [P-I, T-I, T-J, U-J] x [Stable & Next] charms.

FYI Amulet fails on cinder/next proper, so that is not caused by this MP. Investigating that.

[lp:~gnuoy/charms/trusty/cinder/bug1403132]

71. By Liam Young on 2015-01-22

Propogate corosync config option set in the charm to the hacluster subordinate

72. By Liam Young on 2015-01-22

Fix unit tests

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

charm_lint_check #1035 cinder-next for gnuoy mp247153
    LINT OK: passed

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

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

charm_unit_test #1027 cinder-next for gnuoy mp247153
    UNIT OK: passed

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

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

charm_amulet_test #1215 cinder-next for gnuoy mp247153
    AMULET OK: passed

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

[Liam Young (gnuoy)]

Tested upgrade with mojo spec dev/multicast_port_change lp:~ost-maintainers/openstack-mojo-specs/mojo-openstack-specs

[James Page (james-page)]

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2015-01-13 14:36:44 +0000
+++ config.yaml	2015-01-22 16:51:22 +0000
@@ -138,7 +138,7 @@
       with the other members of the HA Cluster.
   ha-mcastport:
     type: int
-    default: 5401
+    default: 5454
     description: |
       Default multicast port number that will be used to communicate between
       HA Cluster nodes.

=== modified file 'hooks/cinder_hooks.py'
--- hooks/cinder_hooks.py	2015-01-13 14:36:44 +0000
+++ hooks/cinder_hooks.py	2015-01-22 16:51:22 +0000
@@ -130,6 +130,8 @@
 
     for rid in relation_ids('cluster'):
         cluster_joined(relation_id=rid)
+    for r_id in relation_ids('ha'):
+        ha_joined(relation_id=r_id)
 
 
 @hooks.hook('shared-db-relation-joined')
@@ -323,7 +325,7 @@
 
 
 @hooks.hook('ha-relation-joined')
-def ha_joined():
+def ha_joined(relation_id=None):
     cluster_config = get_hacluster_config()
 
     resources = {
@@ -361,7 +363,8 @@
             vip_group.append(vip_key)
 
     if len(vip_group) >= 1:
-        relation_set(groups={'grp_cinder_vips': ' '.join(vip_group)})
+        relation_set(relation_id=relation_id,
+                     groups={'grp_cinder_vips': ' '.join(vip_group)})
 
     init_services = {
         'res_cinder_haproxy': 'haproxy'
@@ -369,7 +372,8 @@
     clones = {
         'cl_cinder_haproxy': 'res_cinder_haproxy'
     }
-    relation_set(init_services=init_services,
+    relation_set(relation_id=relation_id,
+                 init_services=init_services,
                  corosync_bindiface=cluster_config['ha-bindiface'],
                  corosync_mcastport=cluster_config['ha-mcastport'],
                  resources=resources,

=== modified file 'unit_tests/test_cluster_hooks.py'
--- unit_tests/test_cluster_hooks.py	2015-01-13 14:36:44 +0000
+++ unit_tests/test_cluster_hooks.py	2015-01-22 16:51:22 +0000
@@ -136,6 +136,7 @@
                 'res_cinder_haproxy': 'op monitor interval="5s"'
             },
             'corosync_bindiface': 'eth100',
+            'relation_id': None,
             'clones': {'cl_cinder_haproxy': 'res_cinder_haproxy'},
             'resources': {
                 'res_cinder_eth101_vip': 'ocf:heartbeat:IPaddr2',
@@ -143,7 +144,8 @@
             }
         }
         self.relation_set.assert_has_calls([
-            call(groups={'grp_cinder_vips': 'res_cinder_eth101_vip'}),
+            call(relation_id=None,
+                 groups={'grp_cinder_vips': 'res_cinder_eth101_vip'}),
             call(**ex_args)
         ])
 
@@ -163,6 +165,7 @@
         self.get_netmask_for_address.return_value = 'ffff.ffff.ffff.ffff'
         hooks.hooks.execute(['hooks/ha-relation-joined'])
         ex_args = {
+            'relation_id': None,
             'corosync_mcastport': '37373',
             'init_services': {'res_cinder_haproxy': 'haproxy'},
             'resource_params': {
@@ -200,6 +203,7 @@
         self.get_netmask_for_address.return_value = None
         hooks.hooks.execute(['hooks/ha-relation-joined'])
         ex_args = {
+            'relation_id': None,
             'corosync_mcastport': '37373',
             'init_services': {'res_cinder_haproxy': 'haproxy'},
             'resource_params': {
@@ -216,7 +220,8 @@
             }
         }
         self.relation_set.assert_has_calls([
-            call(groups={'grp_cinder_vips': 'res_cinder_eth120_vip'}),
+            call(relation_id=None,
+                 groups={'grp_cinder_vips': 'res_cinder_eth120_vip'}),
             call(**ex_args)
         ])