From bcadb3f450e19d51b49ebf4c3bd691ff8aeb38b1 Mon Sep 17 00:00:00 2001 From: Tiago Pasqualini da Silva Date: Fri, 20 Dec 2019 02:05:33 +0000 Subject: [PATCH] Revert "Disable Apache default ports" This reverts commit dcd9a269dc95c504983935a16372db4e7a021426. Change-Id: I842a67a7e167036ddd7fd529b35ef5d5c03f7c53 --- hooks/glance_utils.py | 7 +------ templates/ports.conf | 1 - unit_tests/test_glance_utils.py | 3 --- 3 files changed, 1 insertion(+), 10 deletions(-) delete mode 100644 templates/ports.conf diff --git a/hooks/glance_utils.py b/hooks/glance_utils.py index d6de052b..ac4b9774 100644 --- a/hooks/glance_utils.py +++ b/hooks/glance_utils.py @@ -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'], - }), + }) ]) diff --git a/templates/ports.conf b/templates/ports.conf deleted file mode 100644 index b46c7281..00000000 --- a/templates/ports.conf +++ /dev/null @@ -1 +0,0 @@ -#File written by Juju: leave default ports closed (see LP 1845665). diff --git a/unit_tests/test_glance_utils.py b/unit_tests/test_glance_utils.py index f3133698..f597fa2b 100644 --- a/unit_tests/test_glance_utils.py +++ b/unit_tests/test_glance_utils.py @@ -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),