Remove rabbitmq hostname option

The BindToDevice=lo option has been removed from epmd.socket:
https://bugs.launchpad.net/ubuntu/+source/rabbitmq-server/+bug/1808766

Change-Id: Ib92eaf5efababd37963745bdb8e3ad9354045449
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>

diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha
index a45d397..ff19a69 100755 (executable)
--- 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 a81689e..98e2eff 100755 (executable)
--- 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"