openstack
/
fuel-library
Code Issues Proposed changes

Drop unneccesary node_name_prefix_for_messaging file 

We can get RabbitMQ nodename from rabbitmq-env.conf instead.

Change-Id: Ib2141c6af4aaa81ce1de655dfa4351edda9c32c6
This commit is contained in:
Dmitry Mescheryakov 2016-12-20 21:46:50 +04:00
parent 01e72de4c8
commit b48b2d013f
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
deployment/puppet/cluster/manifests/rabbitmq_fence.pp
View File

@ -61,14 +61,6 @@ class cluster::rabbitmq_fence(
enable => true,
} ->
file { '/etc/rabbitmq/node_name_prefix_for_messaging':
ensure => file,
mode => '0644',
content => hiera('node_name_prefix_for_messaging', 'messaging-'),
notify => Service['rabbit-fence'],
require => Package['fuel-rabbit-fence'],
} ->
service { 'rabbit-fence':
ensure => $enabled ? {
true => running,

10
files/rabbit-fence/rabbit-fence.py
View File

@ -60,11 +60,11 @@ def catchall_signal_lh(*args, **kwargs):
node = args[0]
this_node = socket.gethostname().split('.')[0]
node_name = node.split('.')[0]
cmd = 'cat /etc/rabbitmq/node_name_prefix_for_messaging 2>/dev/null'
node_name_prefix = bash_command(cmd)
if node_name_prefix == 'nil' or node_name_prefix in node_name:
node_name_prefix = ''
node_to_remove = 'rabbit@%s%s' % (node_name_prefix, node_name)
# We're looking for a line like "NODENAME=rabbit@messaging-node-6"
with open('/etc/rabbitmq/rabbitmq-env.conf', 'r') as fl:
node_to_remove = re.findall('^\s*NODENAME\s*=\s*(\S*)\s*$',
fl.read(), re.MULTILINE)[0]
my_logger.info("Got %s that left cluster" % node)
my_logger.debug(kwargs)