diff options
Diffstat (limited to 'mcp')
| -rwxr-xr-x | mcp/config/states/openstack_ha | 3 | ||||
| -rwxr-xr-x | mcp/config/states/openstack_noha | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha index a45d397d3..ff19a69b8 100755 --- a/mcp/config/states/openstack_ha +++ b/mcp/config/states/openstack_ha @@ -15,9 +15,8 @@ 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:cluster:role:master' state.sls rabbitmq" -salt -I 'rabbitmq:server' 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 diff --git a/mcp/config/states/openstack_noha b/mcp/config/states/openstack_noha index a81689e76..98e2eff73 100755 --- a/mcp/config/states/openstack_noha +++ b/mcp/config/states/openstack_noha @@ -16,7 +16,6 @@ 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" |