From 607f89499eb76f113b97f5602c9c98cfbe74a28e Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Tue, 4 Sep 2018 10:48:06 +0400 Subject: Turn off default apache ports Change-Id: Ie1b427975e7596f6ba0eba953d60b21a907d65c5 Signed-off-by: Michael Polenchuk (cherry picked from commit 8de9c24300817b9d0ce4f2bfb2ab63643d895a1a) --- mcp/config/states/openstack_ha | 2 +- mcp/config/states/openstack_noha | 2 +- .../classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2 | 3 ++- .../classes/cluster/mcp-pike-common-ha/openstack_proxy.yml.j2 | 5 +++++ .../classes/cluster/mcp-pike-common-ha/openstack_telemetry.yml | 5 +++++ .../classes/cluster/mcp-pike-common-noha/openstack_control.yml | 5 +++++ mcp/reclass/classes/system | 2 +- 7 files changed, 20 insertions(+), 4 deletions(-) (limited to 'mcp') diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha index 576a47e13..8cdd64baf 100755 --- a/mcp/config/states/openstack_ha +++ b/mcp/config/states/openstack_ha @@ -62,7 +62,7 @@ salt -I 'aodh:server' state.sls aodh -b 1 salt -I 'ceilometer:server' state.sls ceilometer salt -I 'ceilometer:agent' state.sls ceilometer -salt -I 'horizon:server' state.sls horizon +salt -I 'horizon:server' state.sls apache,horizon salt -I 'nginx:server' state.sls nginx cluster_public_host=$(salt -C 'I@nginx:server and *01*' --out=yaml \ diff --git a/mcp/config/states/openstack_noha b/mcp/config/states/openstack_noha index 0fffd7a55..4d716e6a7 100755 --- a/mcp/config/states/openstack_noha +++ b/mcp/config/states/openstack_noha @@ -51,4 +51,4 @@ salt -I 'aodh:server' state.sls aodh salt -I 'ceilometer:server' state.sls ceilometer salt -I 'ceilometer:agent' state.sls ceilometer -salt -I 'horizon:server' state.sls horizon +salt -I 'horizon:server' state.sls apache,horizon diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2 index 6f7b33e3d..adf9162f9 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2 @@ -19,6 +19,7 @@ classes: - system.heat.server.cluster - system.designate.server.cluster - system.designate.server.backend.bind + - system.apache.server.single - system.bind.server.single - system.haproxy.proxy.listen.openstack.nova-placement - system.haproxy.proxy.listen.openstack.glare @@ -107,7 +108,7 @@ parameters: apache: server: bind: - ~ports: ~ + listen_default_ports: false ~modules: - rewrite - wsgi diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_proxy.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_proxy.yml.j2 index 26943b7b6..a4d72a361 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_proxy.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_proxy.yml.j2 @@ -13,6 +13,7 @@ classes: - system.nginx.server.proxy.openstack_web - system.nginx.server.proxy.openstack.aodh - system.nginx.server.proxy.openstack.ceilometer + - system.apache.server.single - system.horizon.server.single - system.salt.minion.cert.proxy - system.sphinx.server.doc.reclass @@ -96,3 +97,7 @@ parameters: vrrp_scripts: check_pidof: args: 'nginx' + apache: + server: + bind: + listen_default_ports: false diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_telemetry.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_telemetry.yml index 88f79adc8..9e0d96066 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_telemetry.yml +++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_telemetry.yml @@ -11,6 +11,7 @@ classes: - system.mongodb.server.cluster - system.mongodb.server.database.ceilometer - system.ceilometer.server.backend.mongodb + - system.apache.server.single # - system.ceilometer.server.backend.influxdb # - system.heka.ceilometer_collector.single - system.ceilometer.server.cluster @@ -34,3 +35,7 @@ parameters: password: ${_param:mongodb_admin_password} logging: verbose: v + apache: + server: + bind: + listen_default_ports: false diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control.yml b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control.yml index 1c94738a4..2d9923d1f 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control.yml +++ b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control.yml @@ -41,6 +41,7 @@ classes: - system.galera.server.database.aodh - service.ceilometer.server.single - system.aodh.server.single + - system.apache.server.single - system.horizon.server.single - service.haproxy.proxy.single - cluster.mcp-pike-common-noha.haproxy_openstack_api @@ -87,6 +88,10 @@ parameters: server: # yamllint disable-line rule:truthy secure: False + apache: + server: + bind: + listen_default_ports: false heat: server: bind: diff --git a/mcp/reclass/classes/system b/mcp/reclass/classes/system index 198b5b745..0d3fc1ed4 160000 --- a/mcp/reclass/classes/system +++ b/mcp/reclass/classes/system @@ -1 +1 @@ -Subproject commit 198b5b7459c9f602ded773e966888705d866f6dd +Subproject commit 0d3fc1ed410c463df962315621aff4b2235825d2 -- cgit 1.2.3-korg