Merge lp:~ivoks/charm-helpers/vip-apache-context into lp:~openstack-charmers/charm-helpers/ssl-everywhere

[James Page]

This merge allows us to use cluster VIP as ServerName in Apache. This is crucial with SSL, where ServerName needs to match CN in the certificate.

=== modified file 'charmhelpers/contrib/openstack/context.py'
--- charmhelpers/contrib/openstack/context.py	2014-02-27 14:40:19 +0000
+++ charmhelpers/contrib/openstack/context.py	2014-03-03 09:00:48 +0000
@@ -432,6 +432,8 @@
             'private_address': unit_get('private-address'),
             'endpoints': []
         }
+        if is_clustered():
+            ctxt['private_address'] = config('vip')
         for api_port in self.external_ports:
             ext_port = determine_apache_port(api_port)
             int_port = determine_api_port(api_port)

=== modified file 'charmhelpers/contrib/templating/contexts.py'
--- charmhelpers/contrib/templating/contexts.py	2013-11-20 09:55:14 +0000
+++ charmhelpers/contrib/templating/contexts.py	2014-03-03 09:00:48 +0000
@@ -12,6 +12,37 @@
 charm_dir = os.environ.get('CHARM_DIR', '')
 
 
+def dict_keys_without_hyphens(a_dict):
+    """Return the a new dict with underscores instead of hyphens in keys."""
+    return dict(
+        (key.replace('-', '_'), val) for key, val in a_dict.items())
+
+
+def update_relations(context, namespace_separator=':'):
+    """Update the context with the relation data."""
+    # Add any relation data prefixed with the relation type.
+    relation_type = charmhelpers.core.hookenv.relation_type()
+    relations = []
+    if relation_type is not None:
+        relation_data = charmhelpers.core.hookenv.relation_get()
+        relation_data = dict(
+            ("{relation_type}{namespace_separator}{key}".format(
+                relation_type=relation_type,
+                key=key,
+                namespace_separator=namespace_separator), val)
+            for key, val in relation_data.items())
+        relation_data = dict_keys_without_hyphens(relation_data)
+        context.update(relation_data)
+        relations = charmhelpers.core.hookenv.relations_of_type(relation_type)
+        relations = [dict_keys_without_hyphens(rel) for rel in relations]
+
+    if 'relations' not in context:
+        context['relations'] = {}
+    if relation_type is not None:
+        relation_type = relation_type.replace('-', '_')
+        context['relations'][relation_type] = relations
+
+
 def juju_state_to_yaml(yaml_path, namespace_separator=':',
                        allow_hyphens_in_keys=True):
     """Update the juju config and state in a yaml file.
@@ -37,17 +68,6 @@
     config['charm_dir'] = charm_dir
     config['local_unit'] = charmhelpers.core.hookenv.local_unit()
 
-    # Add any relation data prefixed with the relation type.
-    relation_type = charmhelpers.core.hookenv.relation_type()
-    if relation_type is not None:
-        relation_data = charmhelpers.core.hookenv.relation_get()
-        relation_data = dict(
-            ("{relation_type}{namespace_separator}{key}".format(
-                relation_type=relation_type.replace('-', '_'),
-                key=key,
-                namespace_separator=namespace_separator), val)
-            for key, val in relation_data.items())
-        config.update(relation_data)
 
     # Don't use non-standard tags for unicode which will not
     # work when salt uses yaml.load_safe.
@@ -66,8 +86,10 @@
         existing_vars = {}
 
     if not allow_hyphens_in_keys:
-        config = dict(
-            (key.replace('-', '_'), val) for key, val in config.items())
+        config = dict_keys_without_hyphens(config)
     existing_vars.update(config)
+
+    update_relations(existing_vars, namespace_separator)
+
     with open(yaml_path, "w+") as fp:
         fp.write(yaml.dump(existing_vars))

=== modified file 'tests/contrib/ansible/test_ansible.py'
--- tests/contrib/ansible/test_ansible.py	2013-11-20 10:05:22 +0000
+++ tests/contrib/ansible/test_ansible.py	2014-03-03 09:00:48 +0000
@@ -78,6 +78,10 @@
         self.mock_relation_get = patcher.start()
         self.mock_relation_get.return_value = {}
         self.addCleanup(patcher.stop)
+        patcher = mock.patch('charmhelpers.core.hookenv.relations_of_type')
+        self.mock_relations_of_type = patcher.start()
+        self.mock_relations_of_type.return_value = []
+        self.addCleanup(patcher.stop)
         patcher = mock.patch('charmhelpers.core.hookenv.relation_type')
         self.mock_relation_type = patcher.start()
         self.mock_relation_type.return_value = None
@@ -131,6 +135,7 @@
                 "private_address": "10.10.10.10",
                 "charm_dir": "",
                 "local_unit": {},
+                'relations': {'wsgi_file': []},
                 "wsgi_file__relation_key1": "relation_value1",
                 "wsgi_file__relation_key2": "relation_value2",
             }, result)

=== modified file 'tests/contrib/openstack/test_os_contexts.py'
--- tests/contrib/openstack/test_os_contexts.py	2014-02-27 14:40:19 +0000
+++ tests/contrib/openstack/test_os_contexts.py	2014-03-03 09:00:48 +0000
@@ -723,7 +723,7 @@
                                              mock_neutron_ctxt):
 
         mock_neutron_ctxt.return_value = {'network_manager': 'neutron',
-                                          'neutron_url': 'https://foo:9292'}
+                                          'neutron_url': 'https://foo:9696'}
         config = {'neutron-alchemy-flags': None}
         self.config.side_effect = lambda key: config[key]
         neutron = context.NeutronContext()
@@ -745,7 +745,7 @@
         self.assertEquals(
             {'network_manager': 'neutron',
              'ovs': 'ovs_context',
-             'neutron_url': 'https://foo:9292'},
+             'neutron_url': 'https://foo:9696'},
             neutron()
         )
 

=== modified file 'tests/contrib/templating/test_contexts.py'
--- tests/contrib/templating/test_contexts.py	2013-11-20 09:55:14 +0000
+++ tests/contrib/templating/test_contexts.py	2014-03-03 09:00:48 +0000
@@ -32,6 +32,10 @@
         patcher = mock.patch('charmhelpers.core.hookenv.local_unit')
         self.mock_local_unit = patcher.start()
         self.addCleanup(patcher.stop)
+        patcher = mock.patch('charmhelpers.core.hookenv.relations_of_type')
+        self.mock_relations_of_type = patcher.start()
+        self.addCleanup(patcher.stop)
+        self.mock_relations_of_type.return_value = []
 
         # patches specific to this test class.
         etc_dir = tempfile.mkdtemp()
@@ -59,6 +63,7 @@
                 "charm_dir": "/tmp/charm_dir",
                 "group_code_owner": "webops_deploy",
                 "user_code_runner": "ubunet",
+                "relations": {},
                 "local_unit": "click-index/3",
             }, result)
 
@@ -80,6 +85,7 @@
                 "group_code_owner": "webops_deploy",
                 "user_code_runner": "ubunet",
                 "local_unit": "click-index/3",
+                "relations": {},
             }, result)
 
     def test_output_with_relation(self):
@@ -106,8 +112,46 @@
                 "wsgi_file:relation_key1": "relation_value1",
                 "wsgi_file:relation_key2": "relation_value2",
                 "local_unit": "click-index/3",
+                "relations": {"wsgi_file": []},
             }, result)
 
+    def test_output_with_multiple_relations(self):
+        self.mock_config.return_value = {
+            'group_code_owner': 'webops_deploy',
+            'user_code_runner': 'ubunet',
+        }
+        self.mock_relation_type.return_value = 'cluster'
+        self.mock_relation_get.return_value = {
+            'private-address': '10.0.3.105',
+        }
+        self.mock_local_unit.return_value = "click-index/3"
+        self.mock_relations_of_type.return_value = [{
+            u'private-address': u'10.0.3.105',
+            '__unit__': u'elasticsearch/1',
+            '__relid__': u'cluster:0',
+        }, {
+            u'private-address': u'10.0.3.107',
+            '__unit__': u'elasticsearch/2',
+            '__relid__': u'cluster:0',
+        }]
+
+        charmhelpers.contrib.templating.contexts.juju_state_to_yaml(
+            self.context_path)
+
+        with open(self.context_path, 'r') as context_file:
+            result = yaml.load(context_file.read())
+            self.assertIn('relations', result)
+            self.assertIn('cluster', result['relations'])
+            self.assertEqual([{
+                u'private_address': u'10.0.3.105',
+                '__unit__': u'elasticsearch/1',
+                '__relid__': u'cluster:0',
+            }, {
+                u'private_address': u'10.0.3.107',
+                '__unit__': u'elasticsearch/2',
+                '__relid__': u'cluster:0',
+            }], result['relations']['cluster'])
+
     def test_relation_with_separator(self):
         self.mock_config.return_value = {
             'group_code_owner': 'webops_deploy',
@@ -132,6 +176,7 @@
                 "wsgi_file__relation_key1": "relation_value1",
                 "wsgi_file__relation_key2": "relation_value2",
                 "local_unit": "click-index/3",
+                "relations": {"wsgi_file": []},
             }, result)
 
     def test_updates_existing_values(self):
@@ -145,6 +190,9 @@
             context_file.write(yaml.dump({
                 'solr:hostname': 'example.com',
                 'user_code_runner': 'oldvalue',
+                'relations': {
+                    'website': [{u'private_address': u'10.0.3.107'}],
+                }
             }))
 
         self.mock_config.return_value = charmhelpers.core.hookenv.Serializable({
@@ -152,6 +200,10 @@
             'user_code_runner': 'newvalue',
         })
         self.mock_local_unit.return_value = "click-index/3"
+        self.mock_relation_type.return_value = 'cluster'
+        self.mock_relations_of_type.return_value = [{
+            u'private-address': u'10.0.3.105',
+        }]
 
         charmhelpers.contrib.templating.contexts.juju_state_to_yaml(
             self.context_path)
@@ -164,6 +216,10 @@
                 "user_code_runner": "newvalue",
                 "local_unit": "click-index/3",
                 "solr:hostname": "example.com",
+                "relations": {
+                    'website': [{u'private_address': u'10.0.3.107'}],
+                    'cluster': [{u'private_address': u'10.0.3.105'}],
+                }
             }, result)
 
     def test_keys_with_hyphens(self):
@@ -184,6 +240,7 @@
                 "charm_dir": "/tmp/charm_dir",
                 "group_code_owner": "webops_deploy",
                 "user_code_runner": "ubunet",
+                "relations": {},
                 "local_unit": "click-index/3",
                 "private-address": "10.1.1.10",
             }, result)
@@ -212,6 +269,7 @@
                 "group_code_owner": "webops_deploy",
                 "user_code_runner": "ubunet",
                 "local_unit": "click-index/3",
+                "relations": {"wsgi_file": []},
                 "private_address": "10.1.1.10",
                 "wsgi_file__relation_key1": "relation_value1",
                 "wsgi_file__relation_key2": "relation_value2",