From 339241fbb1f5593c34eb5bd756bf04f10549f5a4 Mon Sep 17 00:00:00 2001 From: Guillaume Thouvenin Date: Wed, 9 Sep 2015 16:08:20 +0200 Subject: [PATCH] Use internal_address to connect to RabbitMQ RabbitMQ is now listenning on the internal address so we need to use this address instead of 127.0.0.1. Closes-Bug: #1493853 Change-Id: I0c42dc8538254c519cf4acacb7c445f403348799 --- deployment_scripts/puppet/manifests/base.pp | 1 + deployment_scripts/puppet/manifests/controller.pp | 4 ++-- .../modules/lma_collector/templates/wait_for_rabbitmq.erb | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/deployment_scripts/puppet/manifests/base.pp b/deployment_scripts/puppet/manifests/base.pp index d2a0e6292..c9efc6df6 100644 --- a/deployment_scripts/puppet/manifests/base.pp +++ b/deployment_scripts/puppet/manifests/base.pp @@ -76,6 +76,7 @@ if $is_controller{ # Params used by the script. $rabbit = hiera('rabbit') $rabbitmq_port = hiera('amqp_port', '5673') + $rabbitmq_host = hiera('internal_address') $rabbitmq_user = 'nova' $rabbitmq_password = $rabbit['password'] $wait_delay = 30 diff --git a/deployment_scripts/puppet/manifests/controller.pp b/deployment_scripts/puppet/manifests/controller.pp index 87e93b73a..4a7fb7694 100644 --- a/deployment_scripts/puppet/manifests/controller.pp +++ b/deployment_scripts/puppet/manifests/controller.pp @@ -40,9 +40,9 @@ if hiera('deployment_mode') =~ /^ha_/ { $ha_deployment = false } -# OpenStack notifcations are always useful for indexation and metrics collection +# OpenStack notifications are always useful for indexation and metrics collection class { 'lma_collector::notifications::controller': - host => '127.0.0.1', + host => hiera('internal_address'), port => hiera('amqp_port', '5673'), user => $rabbitmq_user, password => $rabbit['password'], diff --git a/deployment_scripts/puppet/modules/lma_collector/templates/wait_for_rabbitmq.erb b/deployment_scripts/puppet/modules/lma_collector/templates/wait_for_rabbitmq.erb index 9e885239d..551ac504e 100644 --- a/deployment_scripts/puppet/modules/lma_collector/templates/wait_for_rabbitmq.erb +++ b/deployment_scripts/puppet/modules/lma_collector/templates/wait_for_rabbitmq.erb @@ -16,7 +16,7 @@ def errback(exc, interval): print_message("{0}, retry in {1} seconds".format(exc, interval)) # First we need to check the connection -with Connection('amqp://<%= @rabbitmq_user %>:<%= @rabbitmq_password %>@localhost:<%= @rabbitmq_port %>//') as conn: +with Connection('amqp://<%= @rabbitmq_user %>:<%= @rabbitmq_password %>@<%= @rabbitmq_host %>:<%= @rabbitmq_port %>//') as conn: conn.ensure_connection(errback, interval_start=<%= @wait_delay %>, interval_step=0)