Revert "Disable Apache default ports"

This reverts commit 25562b842e.

Change-Id: I48496e7d9649b3d7d68cc2c992332e018da263b9

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 = {

templates/ports.conf

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