summaryrefslogtreecommitdiffstats
path: root/mcp/config/states/openstack_noha
diff options
context:
space:
mode:
Diffstat (limited to 'mcp/config/states/openstack_noha')
-rwxr-xr-xmcp/config/states/openstack_noha8
1 files changed, 2 insertions, 6 deletions
diff --git a/mcp/config/states/openstack_noha b/mcp/config/states/openstack_noha
index 98e2eff73..f79d9f657 100755
--- a/mcp/config/states/openstack_noha
+++ b/mcp/config/states/openstack_noha
@@ -38,14 +38,10 @@ salt -I 'heat:server' state.sls heat
salt -I 'cinder:controller' state.sls cinder
wait_for 3 "salt -I 'cinder:volume' state.sls cinder"
-salt -I 'neutron:server' state.sls neutron
+salt -I 'neutron:server' state.sls etcd,neutron
salt -I 'neutron:compute' state.sls neutron
-salt -I 'nova:compute' state.sls nova
-if salt -I 'nova:compute' match.grain 'cpuarch:aarch64' \
- --out yaml --static | grep -q -e 'true' ; then
- salt -C 'G@cpuarch:aarch64 and I@nova:compute' state.sls armband
-fi
+salt -I 'nova:compute' state.sls nova,armband
salt -I 'barbican:server' state.sls barbican
salt -I 'barbican:client' state.sls barbican