diff --git a/hooks/keystone_utils.py b/hooks/keystone_utils.py index cd09b102..dbf269ae 100644 --- a/hooks/keystone_utils.py +++ b/hooks/keystone_utils.py @@ -205,7 +205,6 @@ else: HAPROXY_CONF = '/etc/haproxy/haproxy.cfg' -APACHE_PORTS_CONF = '/etc/apache2/ports.conf' APACHE_CONF = '/etc/apache2/sites-available/openstack_https_frontend' APACHE_24_CONF = '/etc/apache2/sites-available/openstack_https_frontend.conf' MEMCACHED_CONF = '/etc/memcached.conf' @@ -294,10 +293,6 @@ BASE_RESOURCE_MAP = OrderedDict([ context.SyslogContext()], 'services': [], }), - (APACHE_PORTS_CONF, { - 'contexts': [], - 'services': ['apache2'], - }), ]) valid_services = { 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).