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

diff --cc compute.yaml
Simple merge

diff --cc overcloud-without-mergepy.yaml
Simple merge

diff --cc puppet/compute-puppet.yaml
index bc0e4b2,874afd7..a481a2e
--- 1/puppet/compute-puppet.yaml
--- 2/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}
  

diff --cc puppet/controller-puppet.yaml
Simple merge

diff --cc puppet/manifests/overcloud_controller.pp
Simple merge