openstack
/
charms.openstack
Code Issues Proposed changes

Enable addition of proper headers in apache2 

This patchset implements necessary actions which are required to
properly set headers when using SSL.

Change-Id: I78d6e5cadb398464ccec98f7ed2928668942f18b
Closes-Bug: #1736417
Depends-On: I8cf4c048835b85c0845083768ec2d66e940cb15f
This commit is contained in:
Tytus Kurek 2017-12-05 15:52:20 +01:00
parent fab13633ed
commit 42305d5ede
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charms_openstack/charm/classes.py
View File

@ -501,7 +501,7 @@ class HAOpenStackCharm(OpenStackAPICharm):
if os_utils.snap_install_requested():
return
restart = False
for module in ['ssl', 'proxy', 'proxy_http']:
for module in ['ssl', 'proxy', 'proxy_http', 'headers']:
check_enabled = subprocess.call(['a2query', '-m', module])
if check_enabled != 0:
subprocess.check_call(['a2enmod', module])

3
unit_tests/charms_openstack/charm/test_classes.py
View File

@ -611,7 +611,8 @@ class TestHAOpenStackCharm(BaseOpenStackCharmTest):
apache_mods = {
'ssl': 0,
'proxy': 0,
'proxy_http': 1}
'proxy_http': 1,
'headers': 0}
self.patch_object(chm.ch_host, 'service_restart')
self.patch_object(chm.subprocess, 'check_call')
self.patch_object(