Merge "Fix rabbit_hosts list for glance-api for IPv6"

diff --cc puppet/all-nodes-config.yaml
index e85975d,da1b174..97fbdeb
--- 1/puppet/all-nodes-config.yaml
--- 2/puppet/all-nodes-config.yaml
+++ b/puppet/all-nodes-config.yaml
@@@ -264,7 -274,9 +264,8 @@@ resources
                  # NOTE(gfidente): interpolation with %{} in the
                  # hieradata file can't be used as it returns string
                  ceilometer::rabbit_hosts: *rabbit_nodes_array
 -                aodh::rabbit_hosts: *rabbit_nodes_array
                  cinder::rabbit_hosts: *rabbit_nodes_array
+                 glance::notify::rabbitmq::rabbit_hosts: *rabbit_nodes_array
                  heat::rabbit_hosts: *rabbit_nodes_array
                  neutron::rabbit_hosts: *rabbit_nodes_array
                  nova::rabbit_hosts: *rabbit_nodes_array

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

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