Revert "Disable Apache default ports"

This reverts commit 2b251b093f.

Change-Id: I28a3634eb1d980c16aea804e11eb1bbc0c88beec

hooks/cinder_utils.py

@@ -162,7 +162,6 @@ CINDER_POLICY_JSON = '%s/policy.json' % CINDER_CONF_DIR
 CEPH_CONF = '/etc/ceph/ceph.conf'
 
 HAPROXY_CONF = '/etc/haproxy/haproxy.cfg'
-APACHE_PORTS_CONF = '/etc/apache2/ports.conf'
 APACHE_SITE_CONF = '/etc/apache2/sites-available/openstack_https_frontend'
 APACHE_SITE_24_CONF = '/etc/apache2/sites-available/' \
     'openstack_https_frontend.conf'
@@ -251,10 +250,6 @@ BASE_RESOURCE_MAP = OrderedDict([
         'contexts': [cinder_contexts.ApacheSSLContext()],
         'services': ['apache2'],
     }),
-    (APACHE_PORTS_CONF, {
-        'contexts': [],
-        'services': ['apache2'],
-    }),
 ])
 
 

templates/ports.conf

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