Disable Apache default ports

Openstack services don't use the default ports (80 and 443), so
change Apache to not open them.

Change-Id: I896334b232589baacb48da2285829f9e9f0963f9
Closes-bug: #1845665

hooks/cinder_utils.py

@@ -162,6 +162,7 @@ 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'
@@ -250,6 +251,10 @@ BASE_RESOURCE_MAP = OrderedDict([
         'contexts': [cinder_contexts.ApacheSSLContext()],
         'services': ['apache2'],
     }),
+    (APACHE_PORTS_CONF, {
+        'contexts': [],
+        'services': ['apache2'],
+    }),
 ])
 
 

templates/ports.conf

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