X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=mcp%2Fconfig%2Fstates%2Fopenstack_ha;h=a00c21fb3f8a66dbbcb633af5832417f1bdb1e0f;hb=refs%2Fchanges%2F56%2F67256%2F1;hp=230288f4f091d71ecfc6108cffbb76c7c043aaf8;hpb=644e5fdfa2f49b988a5150e2a4eefc12daecd845;p=fuel.git

diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha
index 230288f4f..a00c21fb3 100755
--- a/mcp/config/states/openstack_ha
+++ b/mcp/config/states/openstack_ha
@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash -e
 ##############################################################################
 # Copyright (c) 2017 Mirantis Inc., Enea AB and others.
 # All rights reserved. This program and the accompanying materials
@@ -7,25 +7,28 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
+CI_DEBUG=${CI_DEBUG:-0}; [[ "${CI_DEBUG}" =~ (false|0) ]] || set -x
+
 # shellcheck disable=SC1090
 source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/lib.sh"
 
-salt -I 'keepalived:cluster' state.sls keepalived -b 1
-salt -I 'keepalived:cluster' pillar.get keepalived:cluster:instance:VIP:address
+wait_for 5.0 "salt -I 'keepalived:cluster' state.sls keepalived -b 1"
+wait_for 5.0 "salt -I 'keepalived:cluster' pillar.get keepalived:cluster:instance:VIP:address"
 
-salt -C 'I@rabbitmq:server and *01*' state.sls rabbitmq
-salt -I 'rabbitmq:server' state.sls rabbitmq
+wait_for 5.0 "salt -I 'rabbitmq:cluster:role:master' state.sls rabbitmq"
+salt -I 'rabbitmq:cluster:role:slave' state.sls rabbitmq
 salt -I 'rabbitmq:server' cmd.run "rabbitmqctl cluster_status"
 
 salt -I 'glusterfs:server' state.sls glusterfs.server.service
 salt -I 'glusterfs:server' state.sls glusterfs.server.setup -b 1
 salt -I 'glusterfs:server' cmd.run "gluster peer status; gluster volume status" -b 1
+salt -I 'glusterfs:client' state.sls glusterfs.client
 
 salt -I 'galera:master' state.sls galera
-salt -I 'galera:slave' state.sls galera
+salt -I 'galera:slave' state.sls galera -b 1
 salt -I 'galera:master' mysql.status | grep -A1 wsrep_cluster_size
 
-salt -I 'memcached:server' state.sls memcached
+wait_for 3.0 "salt -I 'memcached:server' state.sls memcached"
 
 salt -I 'haproxy:proxy' state.sls haproxy
 salt -I 'haproxy:proxy' service.status haproxy
@@ -33,38 +36,47 @@ salt -I 'haproxy:proxy' service.restart rsyslog
 
 salt -I 'keystone:server' state.sls keystone.server -b 1
 salt -I 'keystone:server' service.restart apache2
-salt -I 'keystone:client' state.sls keystone.client
+
+wait_for 30.0 "salt -I 'keystone:client' state.sls keystone.client"
 salt -I 'keystone:server' cmd.run ". /root/keystonercv3; openstack service list"
 
 salt -I 'glance:server' state.sls glance -b 1
-salt -I 'glusterfs:client' state.sls glusterfs.client
-salt -I 'keystone:server' state.sls keystone.server
-
-salt -I 'nova:controller' state.sls nova -b 1
+salt -I 'nova:controller:role:primary' state.sls nova
+salt -I 'nova:controller:role:secondary' state.sls nova -b 1
 salt -I 'heat:server' state.sls heat -b 1
 
-salt -I 'cinder:controller' state.sls cinder -b 1
-salt -I 'cinder:volume' state.sls cinder
+wait_for 5.0 "salt -I 'cinder:controller' state.sls cinder -b 1"
+wait_for 3.0 "salt -I 'cinder:volume' state.sls cinder"
 
 salt -I 'neutron:server' state.sls neutron -b 1
 salt -I 'neutron:gateway' state.sls neutron.gateway
-
-salt -I 'nova:compute' state.sls nova
-
-salt -I 'mongodb:server' state.sls mongodb
-wait_for 90 "salt -C 'I@mongodb:server and *01*' cmd.run 'mongo localhost:27017/admin'"
-salt -C 'I@mongodb:server and *01*' cmd.run 'mongo localhost:27017/admin --eval "rs.initiate()"'
-salt -C 'I@mongodb:server and *01*' state.sls mongodb
-
-salt -I 'aodh:server' state.sls aodh
+if salt 'cmp*' match.pillar 'neutron:compute:backend:engine:ovn' \
+  --out yaml --static | grep -q -e 'true' ; then
+  salt -I 'neutron:compute' state.sls neutron.compute
+fi
+
+$(dirname "${BASH_SOURCE[0]}")/nova_nfs_utime
+salt -I 'nova:compute' state.sls nova,armband
+
+salt -I 'barbican:server:role:primary' state.sls barbican
+salt -I 'barbican:server:role:secondary' state.sls barbican -b 1
+salt -I 'barbican:client' state.sls barbican
+
+salt -I 'redis:cluster:role:master' state.sls redis
+salt -I 'redis:server' state.sls redis
+salt -I 'gnocchi:server' state.sls gnocchi -b 1
+salt -I 'panko:server' state.sls panko -b 1
+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
 
-clstr_vip_addr=$(salt -C 'I@nginx:server and *01*' --out=yaml \
-  pillar.get _param:cluster_vip_address | awk '{print $2; exit}')
-salt -C 'I@nginx:server and *01*' cp.push \
-  "/etc/ssl/certs/${clstr_vip_addr}-with-chain.crt" upload_path='certs/os_cacert'
-cd /etc/ssl/certs && ln -sf /var/cache/salt/master/minions/prx01.*/files/certs/os_cacert
+cluster_public_host=$(salt -C 'I@nginx:server and *01*' --out=yaml \
+  pillar.get _param:cluster_public_host | awk '{print $2; exit}')
+dashboard_host=$(salt -C 'I@nginx:server and *01*' --out=yaml cp.push \
+  "/etc/ssl/certs/${cluster_public_host}-with-chain.crt" \
+  upload_path='certs/os_cacert' | cut -d':' -f1)
+cd /etc/ssl/certs && \
+  ln -sf "/var/cache/salt/master/minions/${dashboard_host}/files/certs/os_cacert"