Juju Charms Collection
nova-cloud-controller package

Merge lp:~hopem/charms/trusty/nova-cloud-controller/fix-apachessl-port-selection into lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next

  1. Trusty Tahr (14.04)
  2. fix-apachessl-port-selection
  3. Merge into next
Proposed by Edward Hope-Morley
Status: Merged
Merged at revision: 133
Proposed branch: lp:~hopem/charms/trusty/nova-cloud-controller/fix-apachessl-port-selection
Merge into: lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next
Diff against target: 15 lines (+3/-2)
1 file modified
hooks/charmhelpers/contrib/openstack/context.py (+3/-2)
To merge this branch: bzr merge lp:~hopem/charms/trusty/nova-cloud-controller/fix-apachessl-port-selection
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
Review via email: mp+246132@code.launchpad.net
To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #657 nova-cloud-controller-next for hopem mp246132
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/657/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #686 nova-cloud-controller-next for hopem mp246132
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/686/

Revision history for this message
Liam Young (gnuoy) wrote :

Approve

review: Approve
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #842 nova-cloud-controller-next for hopem mp246132
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/842/

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 2015-01-08 10:04:43 +0000
3+++ hooks/charmhelpers/contrib/openstack/context.py 2015-01-12 12:46:46 +0000
4@@ -663,8 +663,9 @@
5 addresses = self.get_network_addresses()
6 for address, endpoint in sorted(set(addresses)):
7 for api_port in self.external_ports:
8- ext_port = determine_apache_port(api_port)
9- int_port = determine_api_port(api_port)
10+ ext_port = determine_apache_port(api_port,
11+ singlenode_mode=True)
12+ int_port = determine_api_port(api_port, singlenode_mode=True)
13 portmap = (address, endpoint, int(ext_port), int(int_port))
14 ctxt['endpoints'].append(portmap)
15 ctxt['ext_ports'].append(int(ext_port))

Subscribers

People subscribed via source and target branches