diff options
| author |   Giulio Fidente <gfidente@redhat.com> | 2016-03-05 02:35:47 +0100 |
|---|---|---|
| committer | Giulio Fidente <gfidente@redhat.com> | 2016-03-05 02:36:49 +0100 |
| commit | 164d537378cc5f1d65935f081b222ba43942825f (patch) | |
| tree | c09dc441e44d8fe748fe3fcb9608c3641d70046a | |
| parent | 321e605a0a4c219415a3876a84fa063410380cac (diff) | |
Fix rabbit_hosts list for glance-api for IPv6
Previously we were always appending the :port suffix to the list
of rabbitmq nodes but the syntax was invalid for IPv6.
This change wires rabbit_hosts from the templates as it happens
already for the other services. Port can be customized using
rabbit_port.
Change-Id: Iecc7a97d46d7de17e85398c57996c104c9125b0e
| -rw-r--r-- | puppet/all-nodes-config.yaml | 1 | ||||
| -rw-r--r-- | puppet/manifests/overcloud_controller.pp | 5 | ||||
| -rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 5 |
3 files changed, 3 insertions, 8 deletions
diff --git a/puppet/all-nodes-config.yaml b/puppet/all-nodes-config.yaml index f7633a86..da1b174d 100644 --- a/puppet/all-nodes-config.yaml +++ b/puppet/all-nodes-config.yaml @@ -276,6 +276,7 @@ resources: 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 --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp index 10a64e45..44d831aa 100644 --- a/puppet/manifests/overcloud_controller.pp +++ b/puppet/manifests/overcloud_controller.pp @@ -230,11 +230,8 @@ if hiera('step') >= 3 { known_stores => $glance_store, } include ::glance::registry + include ::glance::notify::rabbitmq include join(['::glance::backend::', $glance_backend]) - $rabbit_port = hiera('rabbitmq::port') - class { '::glance::notify::rabbitmq': - rabbit_hosts => suffix(hiera('rabbit_node_ips'), ":${rabbit_port}"), - } class { '::nova' : memcached_servers => suffix(hiera('memcache_node_ips'), ':11211'), diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index edeaa61a..511a2bb1 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -579,11 +579,8 @@ if hiera('step') >= 3 { manage_service => false, enabled => false, } + include ::glance::notify::rabbitmq include join(['::glance::backend::', $glance_backend]) - $rabbit_port = hiera('rabbitmq::port') - class { '::glance::notify::rabbitmq': - rabbit_hosts => suffix(hiera('rabbit_node_ips'), ":${rabbit_port}"), - } class { '::nova' : memcached_servers => suffix(hiera('memcache_node_ips'), ':11211'), |