openstack
/
charm-nova-cloud-controller
Code Issues Proposed changes

Revert "Disable Apache default ports" 

This reverts commit 0bf9812bc1.

Change-Id: Ia935798994e24910ad23aca24cd777aa21d35561
This commit is contained in:
Tiago Pasqualini da Silva 2019-12-20 02:05:22 +00:00
parent 0bf9812bc1
commit 9ad9a8423a
3 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hooks/nova_cc_utils.py
View File

@ -108,7 +108,6 @@ NOVA_CONF = '%s/nova.conf' % NOVA_CONF_DIR
NOVA_API_PASTE = '%s/api-paste.ini' % NOVA_CONF_DIR
VENDORDATA_FILE = '%s/vendor_data.json' % NOVA_CONF_DIR
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'
APACHE_SSL_DIR = '/etc/apache2/ssl/nova'
@ -219,10 +218,6 @@ def get_base_resource_map():
determine_ports)],
'services': ['apache2'],
}),
(APACHE_PORTS_CONF, {
'contexts': [],
'services': ['apache2'],
}),
])
return _BASE_RESOURCE_MAP

1
templates/ports.conf
View File

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

6
unit_tests/test_nova_cc_utils.py
View File

@ -134,7 +134,6 @@ RESTART_MAP_ICEHOUSE = OrderedDict([
]),
('/etc/haproxy/haproxy.cfg', ['haproxy']),
('/etc/apache2/sites-available/openstack_https_frontend', ['apache2']),
('/etc/apache2/ports.conf', ['apache2']),
])
RESTART_MAP_OCATA_ACTUAL = OrderedDict([
('/etc/nova/nova.conf', [
@ -143,7 +142,6 @@ RESTART_MAP_OCATA_ACTUAL = OrderedDict([
('/etc/nova/api-paste.ini', ['nova-api-os-compute', 'apache2']),
('/etc/haproxy/haproxy.cfg', ['haproxy']),
('/etc/apache2/sites-available/openstack_https_frontend', ['apache2']),
('/etc/apache2/ports.conf', ['apache2']),
('/etc/apache2/sites-enabled/wsgi-placement-api.conf', ['apache2']),
])
RESTART_MAP_OCATA_BASE = OrderedDict([
@ -155,8 +153,7 @@ RESTART_MAP_OCATA_BASE = OrderedDict([
'nova-api-os-compute', 'nova-placement-api'
]),
('/etc/haproxy/haproxy.cfg', ['haproxy']),
('/etc/apache2/sites-available/openstack_https_frontend', ['apache2']),
('/etc/apache2/ports.conf', ['apache2']),
('/etc/apache2/sites-available/openstack_https_frontend', ['apache2'])
])
RESTART_MAP_ROCKY_ACTUAL = OrderedDict([
('/etc/nova/nova.conf', [
@ -165,7 +162,6 @@ RESTART_MAP_ROCKY_ACTUAL = OrderedDict([
('/etc/nova/api-paste.ini', ['apache2']),
('/etc/haproxy/haproxy.cfg', ['haproxy']),
('/etc/apache2/sites-available/openstack_https_frontend', ['apache2']),
('/etc/apache2/ports.conf', ['apache2']),
('/etc/apache2/sites-enabled/wsgi-api-os-compute.conf', ['apache2']),
('/etc/apache2/sites-enabled/wsgi-placement-api.conf', ['apache2']),
('/etc/apache2/sites-enabled/wsgi-openstack-metadata.conf', ['apache2']),