aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-11-13 21:43:51 +0000
committerGerrit Code Review <review@openstack.org>2015-11-13 21:43:51 +0000
commitf9932c55cf47525d8e22856d377ee4b5683c091b (patch)
tree7d49072a73aadca0ab4b48fd2f9f3ba64c8d0374
parentfd9d835f180cd8bff9a0f42357e52cd2784d4f75 (diff)
parentcd9264d8d13fe0d460cb0497e554c0028e4c9eee (diff)
Merge "honor the rabbit user and password provided"
-rw-r--r--puppet/compute.yaml2
-rw-r--r--puppet/controller.yaml4
2 files changed, 4 insertions, 2 deletions
diff --git a/puppet/compute.yaml b/puppet/compute.yaml
index 9cfaba61..18547732 100644
--- a/puppet/compute.yaml
+++ b/puppet/compute.yaml
@@ -404,7 +404,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 d8d9a828..ae2b66e3 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -1155,7 +1155,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}
@@ -1246,6 +1246,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}