Juju Charms Collection
nova-cloud-controller package

Merge lp:~hopem/charms/precise/nova-cloud-controller/lp1273469.v2 into lp:~openstack-charmers-archive/charms/precise/nova-cloud-controller/trunk

  1. Precise Pangolin (12.04)
  2. lp1273469.v2
  3. Merge into trunk
Proposed by Edward Hope-Morley
Status: Merged
Merged at revision: 68
Proposed branch: lp:~hopem/charms/precise/nova-cloud-controller/lp1273469.v2
Merge into: lp:~openstack-charmers-archive/charms/precise/nova-cloud-controller/trunk
Diff against target: 19 lines (+2/-2)
2 files modified
hooks/charmhelpers/contrib/openstack/context.py (+1/-1)
revision (+1/-1)
To merge this branch: bzr merge lp:~hopem/charms/precise/nova-cloud-controller/lp1273469.v2
Reviewer Review Type Date Requested Status
James Page Approve
Review via email: mp+208632@code.launchpad.net
To post a comment you must log in.
Revision history for this message
James Page (james-page) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/charmhelpers/contrib/openstack/context.py'
2--- hooks/charmhelpers/contrib/openstack/context.py 2014-02-26 14:15:13 +0000
3+++ hooks/charmhelpers/contrib/openstack/context.py 2014-02-27 15:59:26 +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 'revision'
15--- revision 2014-02-17 10:40:15 +0000
16+++ revision 2014-02-27 15:59:26 +0000
17@@ -1,1 +1,1 @@
18-313
19+314

Subscribers

People subscribed via source and target branches