aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/config/states
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2018-12-20 15:32:48 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2018-12-21 17:21:16 +0400
commite821b9398a5a998bec0143d56efb93018b8bcd8c (patch)
tree8434b89ce9044fab4ef580a8bdbd4d96a6ca075f /mcp/config/states
parenta31343155a621469f6e803b23dc6cc8bbb545dfa (diff)
Pull out rocky patches
This commit should be reverted once original formulas get required support of rocky version. Change-Id: Ia3458381bced0cae8dbfacc9781c90933ad5c822 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'mcp/config/states')
-rwxr-xr-xmcp/config/states/openstack_ha1
-rwxr-xr-xmcp/config/states/openstack_noha1
2 files changed, 2 insertions, 0 deletions
diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha
index 3bd1c51bd..72f401955 100755
--- a/mcp/config/states/openstack_ha
+++ b/mcp/config/states/openstack_ha
@@ -15,6 +15,7 @@ source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/lib.sh"
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 -I 'rabbitmq:server' cmd.run 'mkdir -p /etc/rabbitmq && echo HOSTNAME=localhost > /etc/rabbitmq/rabbitmq-env.conf'
wait_for 5.0 "salt -I 'rabbitmq:server:cluster:role:master' state.sls rabbitmq"
salt -I 'rabbitmq:server' state.sls rabbitmq
salt -I 'rabbitmq:server' cmd.run "rabbitmqctl cluster_status"
diff --git a/mcp/config/states/openstack_noha b/mcp/config/states/openstack_noha
index 98e2eff73..a81689e76 100755
--- a/mcp/config/states/openstack_noha
+++ b/mcp/config/states/openstack_noha
@@ -16,6 +16,7 @@ salt -I 'nfs:server' file.mkdir /srv/nova/instances
salt -I 'nfs:server' state.sls nfs
salt -I 'nfs:client' state.sls nfs
+salt -I 'rabbitmq:server' cmd.run 'mkdir -p /etc/rabbitmq && echo HOSTNAME=localhost > /etc/rabbitmq/rabbitmq-env.conf'
salt -I 'rabbitmq:server' state.sls rabbitmq
salt -I 'rabbitmq:server' cmd.run "rabbitmqctl status"