diff options
| -rwxr-xr-x | mcp/config/states/openstack_ha | 3 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml | 8 |
2 files changed, 1 insertions, 10 deletions
diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha index e1fdf7382..fbddc6e83 100755 --- a/mcp/config/states/openstack_ha +++ b/mcp/config/states/openstack_ha @@ -45,7 +45,7 @@ salt -I 'keystone:server' state.sls keystone.server salt -I 'nova:controller' state.sls nova -b 1 salt -I 'heat:server' state.sls heat -b 1 -salt -I 'cinder:controller' state.sls cinder -b 1 +wait_for 5 "salt -I 'cinder:controller' state.sls cinder -b 1" salt -I 'cinder:volume' state.sls cinder salt -I 'neutron:server' state.sls neutron -b 1 @@ -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 |