openstack
/
charm-glance
Code Issues Proposed changes

Merge "Revert "Disable Apache default ports""

This commit is contained in:
Zuul 2019-12-20 09:40:34 +00:00 committed by Gerrit Code Review
parent 3cdbe5a146 bcadb3f450
commit 16acb63fcc
3 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hooks/glance_utils.py
View File

@ -121,7 +121,6 @@ CEPH_CONF = "/etc/ceph/ceph.conf"
CHARM_CEPH_CONF = '/var/lib/charm/{}/ceph.conf'
HAPROXY_CONF = "/etc/haproxy/haproxy.cfg"
APACHE_PORTS_CONF = '/etc/apache2/ports.conf'
HTTPS_APACHE_CONF = "/etc/apache2/sites-available/openstack_https_frontend"
HTTPS_APACHE_24_CONF = "/etc/apache2/sites-available/" \
"openstack_https_frontend.conf"
@ -209,11 +208,7 @@ CONFIG_FILES = OrderedDict([
(HTTPS_APACHE_24_CONF, {
'hook_contexts': [glance_contexts.ApacheSSLContext()],
'services': ['apache2'],
}),
(APACHE_PORTS_CONF, {
'contexts': [],
'services': ['apache2'],
}),
})
])

1
templates/ports.conf
View File

@ -1 +0,0 @@
#File written by Juju: leave default ports closed (see LP 1845665).

3
unit_tests/test_glance_utils.py
View File

@ -154,7 +154,6 @@ class TestGlanceUtils(CharmTestCase):
(utils.HAPROXY_CONF, ['haproxy']),
(utils.HTTPS_APACHE_CONF, ['apache2']),
(utils.HTTPS_APACHE_24_CONF, ['apache2']),
(utils.APACHE_PORTS_CONF, ['apache2']),
(utils.MEMCACHED_CONF, ['memcached']),
(utils.GLANCE_POLICY_FILE, ['glance-api', 'glance-registry']),
])
@ -176,7 +175,6 @@ class TestGlanceUtils(CharmTestCase):
(utils.HAPROXY_CONF, ['haproxy']),
(utils.HTTPS_APACHE_CONF, ['apache2']),
(utils.HTTPS_APACHE_24_CONF, ['apache2']),
(utils.APACHE_PORTS_CONF, ['apache2']),
(utils.MEMCACHED_CONF, ['memcached']),
(utils.GLANCE_POLICY_FILE, ['glance-api']),
])
@ -200,7 +198,6 @@ class TestGlanceUtils(CharmTestCase):
(utils.HAPROXY_CONF, ['haproxy']),
(utils.HTTPS_APACHE_CONF, ['apache2']),
(utils.HTTPS_APACHE_24_CONF, ['apache2']),
(utils.APACHE_PORTS_CONF, ['apache2']),
(utils.MEMCACHED_CONF, ['memcached']),
(utils.GLANCE_POLICY_FILE, ['glance-api']),
('{}/*'.format(utils.APACHE_SSL_DIR),