Merge lp:~ivoks/charm-helpers/vip-apache-context into lp:charm-helpers

Proposed by Ante Karamatić
Status: Superseded
Proposed branch: lp:~ivoks/charm-helpers/vip-apache-context
Merge into: lp:charm-helpers
Diff against target: 12 lines (+2/-0)
1 file modified
charmhelpers/contrib/openstack/context.py (+2/-0)
To merge this branch: bzr merge lp:~ivoks/charm-helpers/vip-apache-context
Reviewer Review Type Date Requested Status
charmers Pending
Review via email: mp+208959@code.launchpad.net

This proposal has been superseded by a proposal from 2014-03-03.

Description of the change

This merge allows us to use cluster VIP as ServerName in Apache. This is crucial with SSL, where ServerName needs to match CN in the certificate.

To post a comment you must log in.

Unmerged revisions

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-27 15:50:39 +0000
3+++ charmhelpers/contrib/openstack/context.py 2014-03-02 09:21:12 +0000
4@@ -388,6 +388,8 @@
5 'private_address': unit_get('private-address'),
6 'endpoints': []
7 }
8+ if is_clustered():
9+ ctxt['private_address'] = config('vip')
10 for api_port in self.external_ports:
11 ext_port = determine_apache_port(api_port)
12 int_port = determine_api_port(api_port)

Subscribers

People subscribed via source and target branches