From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 1 Apr 2015 08:49:39 +0000 (+0000)
Subject: Merge "Ensure all Rabbit params are propagated to interested nodes."
X-Git-Tag: opnfv-6.0.0~2633
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=76a8a88486e44e761571e1f9d46696aa669fa7ec;p=apex-tripleo-heat-templates.git

Merge "Ensure all Rabbit params are propagated to interested nodes."
---

76a8a88486e44e761571e1f9d46696aa669fa7ec
diff --cc puppet/compute-puppet.yaml
index bc0e4b24,874afd75..a481a2e1
--- a/puppet/compute-puppet.yaml
+++ b/puppet/compute-puppet.yaml
@@@ -321,17 -344,10 +346,8 @@@ resources
                  neutron_agent_mode: {get_input: neutron_agent_mode}
                  neutron_metadata_proxy_shared_secret: {get_input: neutron_metadata_proxy_shared_secret}
                  neutron_mechanism_drivers: {get_input: neutron_mechanism_drivers}
 -                neutron_allow_l3agent_failover: {get_input: neutron_allow_l3agent_failover}
 -                neutron_allow_l3agent_failover: {get_input: neutron_allow_l3agent_failover}
                  neutron_public_interface_raw_device: {get_input: neutron_public_interface_raw_device}
                  admin_password: {get_input: admin_password}
-                 nova::rabbit_host: {get_input: rabbit_host}
-                 neutron::rabbit_host: {get_input: rabbit_host}
-                 ceilometer::rabbit_host: {get_input: rabbit_host}
-                 nova::rabbit_userid: {get_input: rabbit_username}
-                 neutron::rabbit_user: {get_input: rabbit_username}
-                 ceilometer::rabbit_userid: {get_input: rabbit_username}
-                 nova::rabbit_password: {get_input: rabbit_password}
-                 neutron::rabbit_password: {get_input: rabbit_password}
-                 ceilometer::rabbit_password: {get_input: rabbit_password}
                  ntp::servers: {get_input: ntp_servers}
                  enable_package_install: {get_input: enable_package_install}