← Back to branch summary

~landscape/charms/trusty/cinder-leadership-election/trunk

« back to all changes in this revision

Viewing changes to hooks/charmhelpers/contrib/openstack/context.py

  • Committer: Edward Hope-Morley
  • Date: 2015-01-12 13:55:57 UTC
  • mfrom: (65.1.1 cinder)
  • Revision ID: edward.hope-morley@canonical.com-20150112135557-2bcli4jrzejik40z
[hopem,r=gnuoy]

Sync charm-helpers to get apache ssl port fix

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/charmhelpers/contrib/openstack/context.py
663
663
        addresses = self.get_network_addresses()
664
664
        for address, endpoint in sorted(set(addresses)):
665
665
            for api_port in self.external_ports:
666
 
                ext_port = determine_apache_port(api_port)
667
 
                int_port = determine_api_port(api_port)
 
666
                ext_port = determine_apache_port(api_port,
 
667
                                                 singlenode_mode=True)
 
668
                int_port = determine_api_port(api_port, singlenode_mode=True)
668
669
                portmap = (address, endpoint, int(ext_port), int(int_port))
669
670
                ctxt['endpoints'].append(portmap)
670
671
                ctxt['ext_ports'].append(int(ext_port))