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

Proposed by Liam Young
Status: Merged
Merged at revision: 111
Proposed branch: lp:~gnuoy/charms/trusty/keystone/bug1403132
Merge into: lp:~openstack-charmers-archive/charms/trusty/keystone/next
Diff against target: 82 lines (+11/-4)
3 files modified
config.yaml (+1/-1)
hooks/keystone_hooks.py (+7/-3)
unit_tests/test_keystone_hooks.py (+3/-0)
To merge this branch: bzr merge lp:~gnuoy/charms/trusty/keystone/bug1403132
Reviewer Review Type Date Requested Status
James Page Approve
Review via email: mp+247155@code.launchpad.net
To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #944 keystone-next for gnuoy mp247155
    LINT OK: passed

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #973 keystone-next for gnuoy mp247155
    UNIT OK: passed

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #1166 keystone-next for gnuoy mp247155
    AMULET OK: passed

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

Revision history for this message
Ryan Beisner (1chb1n) wrote :

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

108. By Liam Young

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

109. By Liam Young

Update hacluster setting from config-changed

110. By Liam Young

Merged next in and fix unit tests

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #1037 keystone-next for gnuoy mp247155
    LINT OK: passed

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #1029 keystone-next for gnuoy mp247155
    UNIT OK: passed

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #1217 keystone-next for gnuoy mp247155
    AMULET OK: passed

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

111. By Liam Young

Merged trunk in

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #1042 keystone-next for gnuoy mp247155
    LINT OK: passed

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #1034 keystone-next for gnuoy mp247155
    UNIT OK: passed

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #1221 keystone-next for gnuoy mp247155
    AMULET OK: passed

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

Revision history for this message
Liam Young (gnuoy) wrote :

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

Revision history for this message
James Page (james-page) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'config.yaml'
2--- config.yaml 2015-01-13 14:40:50 +0000
3+++ config.yaml 2015-01-23 09:32:27 +0000
4@@ -158,7 +158,7 @@
5 with the other members of the HA Cluster.
6 ha-mcastport:
7 type: int
8- default: 5403
9+ default: 5434
10 description: |
11 Default multicast port number that will be used to communicate between
12 HA Cluster nodes.
13
14=== modified file 'hooks/keystone_hooks.py'
15--- hooks/keystone_hooks.py 2015-01-22 18:44:33 +0000
16+++ hooks/keystone_hooks.py 2015-01-23 09:32:27 +0000
17@@ -155,6 +155,8 @@
18 if settings:
19 for rid in relation_ids('cluster'):
20 relation_set(relation_id=rid, relation_settings=settings)
21+ for r_id in relation_ids('ha'):
22+ ha_joined(relation_id=r_id)
23
24
25 @hooks.hook('shared-db-relation-joined')
26@@ -391,7 +393,7 @@
27
28
29 @hooks.hook('ha-relation-joined')
30-def ha_joined():
31+def ha_joined(relation_id=None):
32 cluster_config = get_hacluster_config()
33 resources = {
34 'res_ks_haproxy': 'lsb:haproxy',
35@@ -427,7 +429,8 @@
36 vip_group.append(vip_key)
37
38 if len(vip_group) >= 1:
39- relation_set(groups={CLUSTER_RES: ' '.join(vip_group)})
40+ relation_set(relation_id=relation_id,
41+ groups={CLUSTER_RES: ' '.join(vip_group)})
42
43 init_services = {
44 'res_ks_haproxy': 'haproxy'
45@@ -435,7 +438,8 @@
46 clones = {
47 'cl_ks_haproxy': 'res_ks_haproxy'
48 }
49- relation_set(init_services=init_services,
50+ relation_set(relation_id=relation_id,
51+ init_services=init_services,
52 corosync_bindiface=cluster_config['ha-bindiface'],
53 corosync_mcastport=cluster_config['ha-mcastport'],
54 resources=resources,
55
56=== modified file 'unit_tests/test_keystone_hooks.py'
57--- unit_tests/test_keystone_hooks.py 2015-01-22 18:44:33 +0000
58+++ unit_tests/test_keystone_hooks.py 2015-01-23 09:32:27 +0000
59@@ -461,6 +461,7 @@
60 self.get_netmask_for_address.return_value = '255.255.255.0'
61 hooks.ha_joined()
62 args = {
63+ 'relation_id': None,
64 'corosync_bindiface': 'em0',
65 'corosync_mcastport': '8080',
66 'init_services': {'res_ks_haproxy': 'haproxy'},
67@@ -486,6 +487,7 @@
68 self.get_netmask_for_address.return_value = None
69 hooks.ha_joined()
70 args = {
71+ 'relation_id': None,
72 'corosync_bindiface': 'em0',
73 'corosync_mcastport': '8080',
74 'init_services': {'res_ks_haproxy': 'haproxy'},
75@@ -510,6 +512,7 @@
76 self.get_netmask_for_address.return_value = '64'
77 hooks.ha_joined()
78 args = {
79+ 'relation_id': None,
80 'corosync_bindiface': 'em0',
81 'corosync_mcastport': '8080',
82 'init_services': {'res_ks_haproxy': 'haproxy'},

Subscribers

People subscribed via source and target branches