openstack/charm-keystone
Code Issues Proposed changes

Revert "Disable Apache default ports"

Browse Source 
This reverts commit 25562b842e0f67101c5e901090857b3f06cc4cbe.

Change-Id: I48496e7d9649b3d7d68cc2c992332e018da263b9
This commit is contained in:
Tiago Pasqualini da Silva 2019-12-20 02:05:25 +00:00
parent 25562b842e
commit 057a3ad7b2
2 changed files with 0 additions and 6 deletions

5
hooks/keystone_utils.py

@ -205,7 +205,6 @@ else:
HAPROXY_CONF = '/etc/haproxy/haproxy.cfg' HAPROXY_CONF = '/etc/haproxy/haproxy.cfg'
APACHE_PORTS_CONF = '/etc/apache2/ports.conf'
APACHE_CONF = '/etc/apache2/sites-available/openstack_https_frontend' APACHE_CONF = '/etc/apache2/sites-available/openstack_https_frontend'
APACHE_24_CONF = '/etc/apache2/sites-available/openstack_https_frontend.conf' APACHE_24_CONF = '/etc/apache2/sites-available/openstack_https_frontend.conf'
MEMCACHED_CONF = '/etc/memcached.conf' MEMCACHED_CONF = '/etc/memcached.conf'
@ -294,10 +293,6 @@ BASE_RESOURCE_MAP = OrderedDict([
context.SyslogContext()], context.SyslogContext()],
'services': [], 'services': [],
}), }),
(APACHE_PORTS_CONF, {
'contexts': [],
'services': ['apache2'],
}),
]) ])
valid_services = { valid_services = {

1
templates/ports.conf

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