diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2017-11-27 07:47:17 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-11-27 07:47:17 +0000 |
| commit | c0541b17b817fbb2a017abea7cde4efad80b116f (patch) | |
| tree | a45cd53b1b7f9f54d4e978b701d2ce2b4f96645f | |
| parent | 8a867449217151f59766a74c6165ffc26c7f50b4 (diff) | |
| parent | 0c71112ec06bd73a3ddc42ba0aacd666e9a00553 (diff) | |
Merge "Revert "Apply apache state on proxy nodes""
| -rwxr-xr-x | mcp/config/states/openstack_ha | 1 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml | 8 |
2 files changed, 0 insertions, 9 deletions
diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha index e1fdf7382..0c1b82f48 100755 --- a/mcp/config/states/openstack_ha +++ b/mcp/config/states/openstack_ha @@ -63,7 +63,6 @@ salt -I 'ceilometer:server' state.sls ceilometer salt -I 'ceilometer:agent' state.sls ceilometer salt -I 'horizon:server' state.sls horizon -salt -I 'apache:server' state.sls apache salt -I 'nginx:server' state.sls nginx,sphinx clstr_vip_addr=$(salt -C 'I@nginx:server and *01*' --out=yaml \ diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml index 6239df2ef..84845658c 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml @@ -16,7 +16,6 @@ classes: - system.nginx.server.proxy.openstack.aodh - system.nginx.server.proxy.openstack.ceilometer - system.horizon.server.single - - system.apache.server.single - system.salt.minion.cert.proxy - system.sphinx.server.doc.reclass - service.keepalived.cluster.single @@ -76,10 +75,3 @@ parameters: proxy: alternative_names: "IP:${_param:openstack_proxy_address}" key_usage: 'digitalSignature, keyEncipherment' - apache: - server: - modules: '' - horizon: - server: - bind: - address: localhost |