Juju Charms Collection
keystone package

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

  1. Trusty Tahr (14.04)
  2. bug1403132
  3. Merge into 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.

lp:~gnuoy/charms/trusty/keystone/bug1403132 updated
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/

lp:~gnuoy/charms/trusty/keystone/bug1403132 updated
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
=== modified file 'config.yaml'
--- config.yaml 2015-01-13 14:40:50 +0000
+++ config.yaml 2015-01-23 09:32:27 +0000
@@ -158,7 +158,7 @@
158 with the other members of the HA Cluster.158 with the other members of the HA Cluster.
159 ha-mcastport:159 ha-mcastport:
160 type: int160 type: int
161 default: 5403161 default: 5434
162 description: |162 description: |
163 Default multicast port number that will be used to communicate between163 Default multicast port number that will be used to communicate between
164 HA Cluster nodes.164 HA Cluster nodes.
165165
=== modified file 'hooks/keystone_hooks.py'
--- hooks/keystone_hooks.py 2015-01-22 18:44:33 +0000
+++ hooks/keystone_hooks.py 2015-01-23 09:32:27 +0000
@@ -155,6 +155,8 @@
155 if settings:155 if settings:
156 for rid in relation_ids('cluster'):156 for rid in relation_ids('cluster'):
157 relation_set(relation_id=rid, relation_settings=settings)157 relation_set(relation_id=rid, relation_settings=settings)
158 for r_id in relation_ids('ha'):
159 ha_joined(relation_id=r_id)
158160
159161
160@hooks.hook('shared-db-relation-joined')162@hooks.hook('shared-db-relation-joined')
@@ -391,7 +393,7 @@
391393
392394
393@hooks.hook('ha-relation-joined')395@hooks.hook('ha-relation-joined')
394def ha_joined():396def ha_joined(relation_id=None):
395 cluster_config = get_hacluster_config()397 cluster_config = get_hacluster_config()
396 resources = {398 resources = {
397 'res_ks_haproxy': 'lsb:haproxy',399 'res_ks_haproxy': 'lsb:haproxy',
@@ -427,7 +429,8 @@
427 vip_group.append(vip_key)429 vip_group.append(vip_key)
428430
429 if len(vip_group) >= 1:431 if len(vip_group) >= 1:
430 relation_set(groups={CLUSTER_RES: ' '.join(vip_group)})432 relation_set(relation_id=relation_id,
433 groups={CLUSTER_RES: ' '.join(vip_group)})
431434
432 init_services = {435 init_services = {
433 'res_ks_haproxy': 'haproxy'436 'res_ks_haproxy': 'haproxy'
@@ -435,7 +438,8 @@
435 clones = {438 clones = {
436 'cl_ks_haproxy': 'res_ks_haproxy'439 'cl_ks_haproxy': 'res_ks_haproxy'
437 }440 }
438 relation_set(init_services=init_services,441 relation_set(relation_id=relation_id,
442 init_services=init_services,
439 corosync_bindiface=cluster_config['ha-bindiface'],443 corosync_bindiface=cluster_config['ha-bindiface'],
440 corosync_mcastport=cluster_config['ha-mcastport'],444 corosync_mcastport=cluster_config['ha-mcastport'],
441 resources=resources,445 resources=resources,
442446
=== modified file 'unit_tests/test_keystone_hooks.py'
--- unit_tests/test_keystone_hooks.py 2015-01-22 18:44:33 +0000
+++ unit_tests/test_keystone_hooks.py 2015-01-23 09:32:27 +0000
@@ -461,6 +461,7 @@
461 self.get_netmask_for_address.return_value = '255.255.255.0'461 self.get_netmask_for_address.return_value = '255.255.255.0'
462 hooks.ha_joined()462 hooks.ha_joined()
463 args = {463 args = {
464 'relation_id': None,
464 'corosync_bindiface': 'em0',465 'corosync_bindiface': 'em0',
465 'corosync_mcastport': '8080',466 'corosync_mcastport': '8080',
466 'init_services': {'res_ks_haproxy': 'haproxy'},467 'init_services': {'res_ks_haproxy': 'haproxy'},
@@ -486,6 +487,7 @@
486 self.get_netmask_for_address.return_value = None487 self.get_netmask_for_address.return_value = None
487 hooks.ha_joined()488 hooks.ha_joined()
488 args = {489 args = {
490 'relation_id': None,
489 'corosync_bindiface': 'em0',491 'corosync_bindiface': 'em0',
490 'corosync_mcastport': '8080',492 'corosync_mcastport': '8080',
491 'init_services': {'res_ks_haproxy': 'haproxy'},493 'init_services': {'res_ks_haproxy': 'haproxy'},
@@ -510,6 +512,7 @@
510 self.get_netmask_for_address.return_value = '64'512 self.get_netmask_for_address.return_value = '64'
511 hooks.ha_joined()513 hooks.ha_joined()
512 args = {514 args = {
515 'relation_id': None,
513 'corosync_bindiface': 'em0',516 'corosync_bindiface': 'em0',
514 'corosync_mcastport': '8080',517 'corosync_mcastport': '8080',
515 'init_services': {'res_ks_haproxy': 'haproxy'},518 'init_services': {'res_ks_haproxy': 'haproxy'},

Subscribers

People subscribed via source and target branches