Merge lp:~hopem/charm-helpers/lp1273469.v2 into lp:charm-helpers

[Edward Hope-Morley]

[James Page (james-page)]

21 - self.relation_get.return_value = 'http://glancehost:9292'
22 - self.assertEquals({'glance_api_servers': 'http://glancehost:9292'},
23 + self.relation_get.return_value = 'http://glancehost:9696'
24 + self.assertEquals({'glance_api_servers': 'http://glancehost:9696'},

A little over zealous on ser/rep.

review: Needs Fixing

=== modified file 'charmhelpers/contrib/openstack/context.py'
--- charmhelpers/contrib/openstack/context.py	2014-02-26 14:11:16 +0000
+++ charmhelpers/contrib/openstack/context.py	2014-02-27 16:22:28 +0000
@@ -466,7 +466,7 @@
             host = config('vip')
         else:
             host = unit_get('private-address')
-        url = '%s://%s:%s' % (proto, host, '9292')
+        url = '%s://%s:%s' % (proto, host, '9696')
         ctxt = {
             'network_manager': self.network_manager,
             'neutron_url': url,
 
=== modified file 'tests/contrib/openstack/test_os_contexts.py'
--- tests/contrib/openstack/test_os_contexts.py	2014-02-25 22:47:13 +0000
+++ tests/contrib/openstack/test_os_contexts.py	2014-02-27 16:22:28 +0000
@@ -631,14 +631,14 @@
         mock_is_clustered.return_value = False
         self.assertEquals(
             {'network_manager': 'neutron',
-             'neutron_url': 'https://%s:9292' % (priv_addr)},
+             'neutron_url': 'https://%s:9696' % (priv_addr)},
             neutron.neutron_ctxt()
         )
 
         mock_is_clustered.return_value = True
         self.assertEquals(
             {'network_manager': 'neutron',
-             'neutron_url': 'https://%s:9292' % (vip)},
+             'neutron_url': 'https://%s:9696' % (vip)},
             neutron.neutron_ctxt()
         )
 
@@ -655,7 +655,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()
@@ -677,7 +677,7 @@
         self.assertEquals(
             {'network_manager': 'neutron',
              'ovs': 'ovs_context',
-             'neutron_url': 'https://foo:9292'},
+             'neutron_url': 'https://foo:9696'},
             neutron()
         )