Charm Helpers

Merge lp:~gabor.meszaros/charm-helpers/devel into lp:charm-helpers

  1. devel
  2. Merge into devel
Proposed by Gábor Mészáros
Status: Merged
Merged at revision: 651
Proposed branch: lp:~gabor.meszaros/charm-helpers/devel
Merge into: lp:charm-helpers
Diff against target: 37 lines (+3/-2)
3 files modified
charmhelpers/contrib/openstack/context.py (+1/-1)
charmhelpers/contrib/openstack/templates/openstack_https_frontend (+1/-0)
tests/contrib/openstack/test_os_contexts.py (+1/-1)
To merge this branch: bzr merge lp:~gabor.meszaros/charm-helpers/devel
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
Gábor Mészáros (community) Approve
Ante Karamatić (community) Approve
Review via email: mp+308063@code.launchpad.net

Description of the change

Configure Apache SSL termination on a load balancer

To post a comment you must log in.
Revision history for this message
Ante Karamatić (ivoks) wrote :

LGTM

review: Approve
Revision history for this message
Ante Karamatić (ivoks) wrote :

Please also fix templates/openstack_https_frontend.conf

review: Needs Fixing
Revision history for this message
Gábor Mészáros (gabor.meszaros) wrote :

That is a symlink to templates/openstack_https_frontend

Gábor Mészáros
Dedicated Services Engineer - Customer Success
Canonical | Ubuntu | Ubuntu Cloud <http://www.ubuntu.com/cloud>
Cell: +36 (30) 328-5290

On Mon, Oct 10, 2016 at 5:33 PM, Ante Karamatić <
<email address hidden>> wrote:

> Review: Needs Fixing
>
> Please also fix templates/openstack_https_frontend.conf
> --
> https://code.launchpad.net/~gabor.meszaros/charm-helpers/
> devel/+merge/308063
> You are the owner of lp:~gabor.meszaros/charm-helpers/devel.
>

Revision history for this message
Gábor Mészáros (gabor.meszaros) wrote :

That is a symlink to templates/openstack_https_frontend

review: Needs Resubmitting
Revision history for this message
Ante Karamatić (ivoks) wrote :

Ah, true. Sorry

review: Approve
Revision history for this message
Gábor Mészáros (gabor.meszaros) :
review: Approve
Revision history for this message
Liam Young (gnuoy) wrote :

I believe the issue this addresses is https://bugs.launchpad.net/heat/+bug/1235555

LGTM

review: Approve

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 2016-09-28 13:56:48 +0000
3+++ charmhelpers/contrib/openstack/context.py 2016-10-10 15:05:12 +0000
4@@ -644,7 +644,7 @@
5 service_namespace = None
6
7 def enable_modules(self):
8- cmd = ['a2enmod', 'ssl', 'proxy', 'proxy_http']
9+ cmd = ['a2enmod', 'ssl', 'proxy', 'proxy_http', 'headers']
10 check_call(cmd)
11
12 def configure_cert(self, cn=None):
13
14=== modified file 'charmhelpers/contrib/openstack/templates/openstack_https_frontend'
15--- charmhelpers/contrib/openstack/templates/openstack_https_frontend 2016-03-01 14:05:46 +0000
16+++ charmhelpers/contrib/openstack/templates/openstack_https_frontend 2016-10-10 15:05:12 +0000
17@@ -13,6 +13,7 @@
18 ProxyPass / http://localhost:{{ int }}/
19 ProxyPassReverse / http://localhost:{{ int }}/
20 ProxyPreserveHost on
21+ RequestHeader set X-Forwarded-Proto "https"
22 </VirtualHost>
23 {% endfor -%}
24 <Proxy *>
25
26=== modified file 'tests/contrib/openstack/test_os_contexts.py'
27--- tests/contrib/openstack/test_os_contexts.py 2016-09-28 13:56:48 +0000
28+++ tests/contrib/openstack/test_os_contexts.py 2016-10-10 15:05:12 +0000
29@@ -1792,7 +1792,7 @@
30 '''Test apache2 context also loads required apache modules'''
31 apache = context.ApacheSSLContext()
32 apache.enable_modules()
33- ex_cmd = ['a2enmod', 'ssl', 'proxy', 'proxy_http']
34+ ex_cmd = ['a2enmod', 'ssl', 'proxy', 'proxy_http', 'headers']
35 self.check_call.assert_called_with(ex_cmd)
36
37 def test_https_configure_cert(self):

Subscribers

People subscribed via source and target branches