X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=mcp%2Fconfig%2Fstates%2Fopenstack_noha;h=f79d9f657933f60c21da04ab57354c16dfe308b6;hb=bd060e9b47ff971b2e757800138588a58c925633;hp=70db238be33fc40b75ed5adec4f44d170f2b6166;hpb=dfe08086ac3d02a921bdd5cb3e52865396f1d774;p=fuel.git

diff --git a/mcp/config/states/openstack_noha b/mcp/config/states/openstack_noha
index 70db238be..f79d9f657 100755
--- a/mcp/config/states/openstack_noha
+++ b/mcp/config/states/openstack_noha
@@ -23,17 +23,14 @@ salt -I 'mysql:server' state.sls mysql
 salt -I 'memcached:server' state.sls memcached
 salt -I 'haproxy:proxy' state.sls haproxy
 
-set +e; salt -I 'keystone:server' state.sls keystone.server; set -e
-salt -I 'keystone:server' service.restart apache2
 salt -I 'keystone:server' state.sls keystone.server
+salt -I 'keystone:server' service.restart apache2
 
 salt -I 'keystone:server' state.sls keystone.client
 salt -I 'keystone:server' cmd.run ". /root/keystonercv3; openstack service list"
 
 salt -I 'glance:server' state.sls glance
 
-# apply nova state twice to complete broken db sync
-salt -I 'nova:controller' state.sls nova
 salt -I 'nova:controller' state.sls nova
 
 salt -I 'heat:server' state.sls heat
@@ -41,10 +38,13 @@ 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
+salt -I 'nova:compute' state.sls nova,armband
+
+salt -I 'barbican:server' state.sls barbican
+salt -I 'barbican:client' state.sls barbican
 
 salt -I 'redis:server' state.sls redis
 salt -I 'gnocchi:server' state.sls gnocchi
@@ -53,4 +53,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