Merge "Revert "Disable Apache default ports""

lib/swift_utils.py

@@ -93,7 +93,6 @@ MEMCACHED_CONF = '/etc/memcached.conf'
 SWIFT_RINGS_CONF = '/etc/apache2/conf.d/swift-rings'
 SWIFT_RINGS_24_CONF = '/etc/apache2/conf-available/swift-rings.conf'
 HAPROXY_CONF = '/etc/haproxy/haproxy.cfg'
-APACHE_PORTS_CONF = '/etc/apache2/ports.conf'
 APACHE_SITES_AVAILABLE = '/etc/apache2/sites-available'
 APACHE_SITE_CONF = os.path.join(APACHE_SITES_AVAILABLE,
                                 'openstack_https_frontend')
@@ -200,10 +199,6 @@ CONFIG_FILES = OrderedDict([
         'hook_contexts': [MemcachedContext()],
         'services': ['memcached'],
     }),
-    (APACHE_PORTS_CONF, {
-        'contexts': [],
-        'services': ['apache2'],
-    }),
 ])
 
 RING_CONSUMER_ROLE = 'swift-proxy-rings-consumer'

templates/ports.conf

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