Sync os cacert from proxy to salt master

[fuel.git] / mcp / config / states / openstack_ha

diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha
index 90e510a..cc4279c 100755 (executable)
--- a/mcp/config/states/openstack_ha
+++ b/mcp/config/states/openstack_ha
@@ -1,7 +1,11 @@
+#!/bin/bash
+set -x
+
 salt -I 'keepalived:cluster' state.sls keepalived -b 1
 salt -I 'keepalived:cluster' pillar.get keepalived:cluster:instance:VIP:address
 
-salt -I 'rabbitmq:server' state.sls rabbitmq # maybe twice
+salt -C 'I@rabbitmq:server and *01*' state.sls rabbitmq
+salt -I 'rabbitmq:server' state.sls rabbitmq
 salt -I 'rabbitmq:server' cmd.run "rabbitmqctl cluster_status"
 
 salt -I 'glusterfs:server' state.sls glusterfs.server.service
@@ -34,9 +38,12 @@ 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 'horizon:server' state.sls horizon
 salt -I 'nginx:server' state.sls nginx
+
+salt -C 'I@nginx:server and *01*' cp.push /etc/ssl/certs/10.167.4.80-with-chain.crt upload_path='/os_cacert'
+cd /etc/ssl/certs && ln -s /var/cache/salt/master/minions/prx01.*/files/os_cacert