Merge lp:~billy-olsen/charms/trusty/keystone/multi-region-dashboard into lp:~openstack-charmers-archive/charms/trusty/keystone/next

Proposed by Billy Olsen
Status: Merged
Merged at revision: 92
Proposed branch: lp:~billy-olsen/charms/trusty/keystone/multi-region-dashboard
Merge into: lp:~openstack-charmers-archive/charms/trusty/keystone/next
Diff against target: 25 lines (+3/-1)
2 files modified
hooks/keystone_utils.py (+1/-0)
unit_tests/test_keystone_utils.py (+2/-1)
To merge this branch: bzr merge lp:~billy-olsen/charms/trusty/keystone/multi-region-dashboard
Reviewer Review Type Date Requested Status
James Page Needs Fixing
Review via email: mp+243357@code.launchpad.net

Commit message

[wolsen,r=]
Share the region information in the relation data for services which expose no endpoints but use information regarding services and endpoints currently available.

Description of the change

Share the region information in the relation data for services which expose no endpoints but use information regarding services and endpoints currently available.

To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

UOSCI bot says:
charm_lint_check #1302 keystone-next for billy-olsen mp243357
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option ssl_ca has no default value
  I: config.yaml: option os-public-network has no default value
  I: config.yaml: option os-admin-network has no default value
  I: config.yaml: option ssl_cert has no default value
  I: config.yaml: option os-internal-network has no default value

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

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

UOSCI bot says:
charm_unit_test #1136 keystone-next for billy-olsen mp243357
    UNIT OK: passed

UNIT Results (max last 5 lines):
  hooks/keystone_ssl 158 132 16% 106-128, 132-146, 150-158, 162-172, 176-177, 182-193, 197-206, 210-221, 225-237, 243-256, 259-266, 269-279, 282-296, 299-302
  hooks/keystone_utils 388 202 48% 204, 218, 242-247, 290-299, 306-321, 328-336, 341-351, 358-384, 389-398, 403-417, 422-444, 449-466, 480-503, 512-517, 522, 529-539, 544-552, 557-562, 566-573, 581-586, 597-612, 616-624, 649-650, 730, 733, 782-795, 819-823, 827-839
  TOTAL 809 404 50%
  Ran 37 tests in 2.891s
  OK

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

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

UOSCI bot says:
charm_amulet_test #568 keystone-next for billy-olsen mp243357
    AMULET OK: passed

AMULET Results (max last 5 lines):
  juju-test.conductor.15-basic-trusty-icehouse RESULT :
  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 test output: http://paste.ubuntu.com/9340537/
Build: http://10.98.191.181:8080/job/charm_amulet_test/568/

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

I think that 'region' can be a space delimited list - does that work OK with this change?

review: Needs Fixing

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/keystone_utils.py'
2--- hooks/keystone_utils.py 2014-10-07 12:29:11 +0000
3+++ hooks/keystone_utils.py 2014-12-02 05:27:43 +0000
4@@ -650,6 +650,7 @@
5 relation_data["service_protocol"] = "http"
6 relation_data["auth_port"] = config('admin-port')
7 relation_data["service_port"] = config('service-port')
8+ relation_data["region"] = config('region')
9 if config('https-service-endpoints') in ['True', 'true']:
10 # Pass CA cert as client will need it to
11 # verify https connections
12
13=== modified file 'unit_tests/test_keystone_utils.py'
14--- unit_tests/test_keystone_utils.py 2014-09-25 09:51:37 +0000
15+++ unit_tests/test_keystone_utils.py 2014-12-02 05:27:43 +0000
16@@ -179,7 +179,8 @@
17 'auth_port': 80,
18 'service_port': 81,
19 'https_keystone': 'True',
20- 'ca_cert': 'certificate'}
21+ 'ca_cert': 'certificate',
22+ 'region': 'RegionOne'}
23 self.peer_store_and_set.assert_called_with(
24 relation_id=relation_id,
25 **relation_data)

Subscribers

People subscribed via source and target branches