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

[Billy Olsen]

[wolsen,r=]
Add support for handling multiple regions in the openstack-dashboard, either via multiple keystone services and/or multiple regions within a single keystone service.

Add support for handling multiple regions in the openstack-dashboard, either via multiple keystone services and/or multiple regions within a single keystone service.

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

UOSCI bot says:
charm_lint_check #1301 openstack-dashboard-next for billy-olsen mp243356
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option profile has no default value
  I: config.yaml: option ssl_key has no default value
  I: config.yaml: option vip has no default value
  I: config.yaml: option ssl_cert has no default value
  I: config.yaml: option secret has no default value

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

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

UOSCI bot says:
charm_unit_test #1135 openstack-dashboard-next for billy-olsen mp243356
    UNIT OK: passed

UNIT Results (max last 5 lines):
  hooks/horizon_hooks 86 8 91% 73-74, 122-124, 149-150, 169
  hooks/horizon_utils 73 8 89% 135, 190-202
  TOTAL 232 17 93%
  Ran 41 tests in 1.569s
  OK

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

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

UOSCI bot says:
charm_amulet_test #567 openstack-dashboard-next for billy-olsen mp243356
    AMULET FAIL: amulet-test missing

AMULET Results (max last 5 lines):
INFO:root:Workspace dir: /var/lib/jenkins/workspace/charm_amulet_test
INFO:root:Reading file: Makefile
INFO:root:Searching for: ['@juju test']
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

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

[Liang Chen (cbjchen)]

Since the mutilple region support is handled by this patch, the following comments right above the changes in both local_setting can probably be removed.

# For multiple regions uncomment this configuration, and add (endpoint, title).
# AVAILABLE_REGIONS = [
# ('http://cluster1.example.com:5000/v2.0', 'cluster1'),
# ('http://cluster2.example.com:5000/v2.0', 'cluster2'),
# ]

=== modified file 'hooks/horizon_contexts.py'
--- hooks/horizon_contexts.py	2014-10-15 19:47:09 +0000
+++ hooks/horizon_contexts.py	2014-12-02 05:22:54 +0000
@@ -69,22 +69,41 @@
     def __call__(self):
         log('Generating template context for identity-service')
         ctxt = {}
+        regions = set()
 
         for rid in relation_ids('identity-service'):
             for unit in related_units(rid):
                 rdata = relation_get(rid=rid, unit=unit)
                 serv_host = rdata.get('service_host')
                 serv_host = format_ipv6_addr(serv_host) or serv_host
+                region = rdata.get('region')
 
-                ctxt = {
+                local_ctxt = {
                     'service_port': rdata.get('service_port'),
                     'service_host': serv_host,
                     'service_protocol':
-                    rdata.get('service_protocol') or 'http',
+                    rdata.get('service_protocol') or 'http'
                 }
-                if context_complete(ctxt):
-                    return ctxt
-        return {}
+
+                if not context_complete(local_ctxt):
+                    continue
+
+                # Update the service endpoint and title for each available
+                # region in order to support multi-region deployments
+                if region is not None:
+                    endpoint = ("%(service_protocol)s://%(service_host)s"
+                                ":%(service_port)s/v2.0") % local_ctxt
+                    for reg in region.split():
+                        regions.add((endpoint, reg))
+
+                if len(ctxt) == 0:
+                    ctxt = local_ctxt
+
+        if len(regions) > 1:
+            avail_regions = map(lambda r: {'endpoint': r[0], 'title': r[1]},
+                                regions)
+            ctxt['regions'] = sorted(avail_regions)
+        return ctxt
 
 
 class HorizonContext(OSContextGenerator):

=== modified file 'templates/icehouse/local_settings.py'
--- templates/icehouse/local_settings.py	2014-08-21 00:36:43 +0000
+++ templates/icehouse/local_settings.py	2014-12-02 05:22:54 +0000
@@ -120,6 +120,13 @@
 #     ('http://cluster1.example.com:5000/v2.0', 'cluster1'),
 #     ('http://cluster2.example.com:5000/v2.0', 'cluster2'),
 # ]
+{% if regions|length > 1 -%}
+AVAILABLE_REGIONS = [
+{% for region in regions -%}
+    ('{{ region.endpoint }}', '{{ region.title }}'),
+{% endfor -%}
+]
+{% endif -%}
 
 OPENSTACK_HOST = "{{ service_host }}"
 OPENSTACK_KEYSTONE_URL = "{{ service_protocol }}://%s:{{ service_port }}/v2.0" % OPENSTACK_HOST

=== modified file 'templates/juno/local_settings.py'
--- templates/juno/local_settings.py	2014-10-06 14:47:17 +0000
+++ templates/juno/local_settings.py	2014-12-02 05:22:54 +0000
@@ -132,6 +132,13 @@
 #     ('http://cluster1.example.com:5000/v2.0', 'cluster1'),
 #     ('http://cluster2.example.com:5000/v2.0', 'cluster2'),
 # ]
+{% if regions|length > 1 -%}
+AVAILABLE_REGIONS = [
+{% for region in regions -%}
+    ('{{ region.endpoint }}', '{{ region.title }}'),
+{% endfor -%}
+]
+{% endif -%}
 
 OPENSTACK_HOST = "{{ service_host }}"
 OPENSTACK_KEYSTONE_URL = "{{ service_protocol }}://%s:{{ service_port }}/v2.0" % OPENSTACK_HOST

=== modified file 'unit_tests/test_horizon_contexts.py'
--- unit_tests/test_horizon_contexts.py	2014-10-15 19:47:09 +0000
+++ unit_tests/test_horizon_contexts.py	2014-12-02 05:22:54 +0000
@@ -180,6 +180,36 @@
                           {'service_host': 'foo', 'service_port': 5000,
                            'service_protocol': 'http'})
 
+    @patch("horizon_contexts.format_ipv6_addr")
+    def test_IdentityServiceContext_single_region(self, mock_format_ipv6_addr):
+        mock_format_ipv6_addr.return_value = "foo"
+        self.relation_ids.return_value = ['foo']
+        self.related_units.return_value = ['bar', 'baz']
+        self.relation_get.side_effect = self.test_relation.get
+        self.test_relation.set({'service_host': 'foo', 'service_port': 5000,
+                                'region': 'regionOne'})
+        self.context_complete.return_value = True
+        self.assertEquals(horizon_contexts.IdentityServiceContext()(),
+                          {'service_host': 'foo', 'service_port': 5000,
+                           'service_protocol': 'http'})
+
+    @patch("horizon_contexts.format_ipv6_addr")
+    def test_IdentityServiceContext_multi_region(self, mock_format_ipv6_addr):
+        mock_format_ipv6_addr.return_value = "foo"
+        self.relation_ids.return_value = ['foo']
+        self.related_units.return_value = ['bar', 'baz']
+        self.relation_get.side_effect = self.test_relation.get
+        self.test_relation.set({'service_host': 'foo', 'service_port': 5000,
+                                'region': 'regionOne regionTwo'})
+        self.context_complete.return_value = True
+        self.assertEqual(horizon_contexts.IdentityServiceContext()(),
+                         {'service_host': 'foo', 'service_port': 5000,
+                          'service_protocol': 'http',
+                          'regions': [{'endpoint': 'http://foo:5000/v2.0',
+                                       'title': 'regionOne'},
+                                      {'endpoint': 'http://foo:5000/v2.0',
+                                       'title': 'regionTwo'}]})
+
     def test_HorizonHAProxyContext_no_cluster(self):
         self.relation_ids.return_value = []
         self.local_unit.return_value = 'openstack-dashboard/0'