X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=mcp%2Fconfig%2Fstates%2Fopenstack_ha;h=c4c513da108956c655ff3b737756a9b5e9df672e;hb=refs%2Fchanges%2F11%2F45111%2F2;hp=2597e82e3eb455af6f7e5929b88f3d25d037478d;hpb=0f3fc04189db6156dd3a6d85c834f94b1d0c69aa;p=fuel.git

diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha
index 2597e82e3..c4c513da1 100755
--- a/mcp/config/states/openstack_ha
+++ b/mcp/config/states/openstack_ha
@@ -1,6 +1,9 @@
 #!/bin/bash
 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
 
@@ -28,7 +31,7 @@ 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 'glance:server' state.sls glusterfs.client
+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
@@ -38,9 +41,24 @@ 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
-salt -I 'neutron:gateway' state.sls neutron
+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
+salt -I 'ceilometer:server' state.sls ceilometer
+salt -I 'ceilometer:agent' state.sls ceilometer
+
 salt -I 'horizon:server' state.sls 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