Charm Helpers

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

  1. lp1273469.v2
  2. Merge into devel
Proposed by Edward Hope-Morley
Status: Merged
Merged at revision: 125
Proposed branch: lp:~hopem/charm-helpers/lp1273469.v2
Merge into: lp:charm-helpers
Diff against target: 50 lines (+5/-5)
2 files modified
charmhelpers/contrib/openstack/context.py (+1/-1)
tests/contrib/openstack/test_os_contexts.py (+4/-4)
To merge this branch: bzr merge lp:~hopem/charm-helpers/lp1273469.v2
Reviewer Review Type Date Requested Status
James Page Pending
Review via email: mp+208637@code.launchpad.net

This proposal supersedes a proposal from 2014-02-27.

To post a comment you must log in.
Revision history for this message
James Page (james-page) wrote : Posted in a previous version of this proposal

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'charmhelpers/contrib/openstack/context.py'
2--- charmhelpers/contrib/openstack/context.py 2014-02-26 14:11:16 +0000
3+++ charmhelpers/contrib/openstack/context.py 2014-02-27 16:22:28 +0000
4@@ -466,7 +466,7 @@
5 host = config('vip')
6 else:
7 host = unit_get('private-address')
8- url = '%s://%s:%s' % (proto, host, '9292')
9+ url = '%s://%s:%s' % (proto, host, '9696')
10 ctxt = {
11 'network_manager': self.network_manager,
12 'neutron_url': url,
13
14=== modified file 'tests/contrib/openstack/test_os_contexts.py'
15--- tests/contrib/openstack/test_os_contexts.py 2014-02-25 22:47:13 +0000
16+++ tests/contrib/openstack/test_os_contexts.py 2014-02-27 16:22:28 +0000
17@@ -631,14 +631,14 @@
18 mock_is_clustered.return_value = False
19 self.assertEquals(
20 {'network_manager': 'neutron',
21- 'neutron_url': 'https://%s:9292' % (priv_addr)},
22+ 'neutron_url': 'https://%s:9696' % (priv_addr)},
23 neutron.neutron_ctxt()
24 )
25
26 mock_is_clustered.return_value = True
27 self.assertEquals(
28 {'network_manager': 'neutron',
29- 'neutron_url': 'https://%s:9292' % (vip)},
30+ 'neutron_url': 'https://%s:9696' % (vip)},
31 neutron.neutron_ctxt()
32 )
33
34@@ -655,7 +655,7 @@
35 mock_neutron_ctxt):
36
37 mock_neutron_ctxt.return_value = {'network_manager': 'neutron',
38- 'neutron_url': 'https://foo:9292'}
39+ 'neutron_url': 'https://foo:9696'}
40 config = {'neutron-alchemy-flags': None}
41 self.config.side_effect = lambda key: config[key]
42 neutron = context.NeutronContext()
43@@ -677,7 +677,7 @@
44 self.assertEquals(
45 {'network_manager': 'neutron',
46 'ovs': 'ovs_context',
47- 'neutron_url': 'https://foo:9292'},
48+ 'neutron_url': 'https://foo:9696'},
49 neutron()
50 )
51

Subscribers

People subscribed via source and target branches