From: Jenkins <jenkins@review.openstack.org>
Date: Mon, 7 Mar 2016 16:24:00 +0000 (+0000)
Subject: Merge "Fix rabbit_hosts list for glance-api for IPv6"
X-Git-Tag: opnfv-6.0.0~2125
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=89b1177f58f1e9a40894b731734dbd2b67f5aefe;p=apex-tripleo-heat-templates.git

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

89b1177f58f1e9a40894b731734dbd2b67f5aefe
diff --cc puppet/all-nodes-config.yaml
index e85975d4,da1b174d..97fbdebb
--- a/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