From: Mike Burns <mburns@redhat.com>
Date: Tue, 10 Nov 2015 18:06:58 +0000 (-0500)
Subject: honor the rabbit user and password provided
X-Git-Tag: opnfv-6.0.0~2313^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=cd9264d8d13fe0d460cb0497e554c0028e4c9eee;p=apex-tripleo-heat-templates.git

honor the rabbit user and password provided

Currently rabbit username and password are defaulted and attempting
to use anything else would result in a failure during deployment.

Change-Id: I8a2e240a19f915309eee45ea3c3368d131af6c1b
Related:  rhbz#1261303
---

diff --git a/puppet/compute.yaml b/puppet/compute.yaml
index 2b635357..5df4cb37 100644
--- a/puppet/compute.yaml
+++ b/puppet/compute.yaml
@@ -406,7 +406,7 @@ resources:
                 nova::glance_api_servers: {get_input: glance_api_servers}
                 neutron::debug: {get_input: debug}
                 neutron::rabbit_password: {get_input: rabbit_password}
-                neutron::rabbit_user: {get_input: rabbit_user}
+                neutron::rabbit_user: {get_input: rabbit_username}
                 neutron::rabbit_use_ssl: {get_input: rabbit_client_use_ssl}
                 neutron::rabbit_port: {get_input: rabbit_client_port}
                 neutron_flat_networks: {get_input: neutron_flat_networks}
diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index 009199d4..69690f60 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -1426,7 +1426,7 @@ resources:
                 # Neutron
                 neutron::bind_host: {get_input: neutron_api_network}
                 neutron::rabbit_password: {get_input: rabbit_password}
-                neutron::rabbit_user: {get_input: rabbit_user}
+                neutron::rabbit_user: {get_input: rabbit_username}
                 neutron::rabbit_use_ssl: {get_input: rabbit_client_use_ssl}
                 neutron::rabbit_port: {get_input: rabbit_client_port}
                 neutron::debug: {get_input: debug}
@@ -1538,6 +1538,8 @@ resources:
                 rabbitmq::node_ip_address: {get_input: rabbitmq_network}
                 rabbitmq::erlang_cookie: {get_input: rabbit_cookie}
                 rabbitmq::file_limit: {get_input: rabbit_fd_limit}
+                rabbitmq::default_user: {get_input: rabbit_username}
+                rabbitmq::default_pass: {get_input: rabbit_password}
                 # Redis
                 redis::bind: {get_input: redis_network}
                 redis_vip: {get_input: redis_vip}