diff options
author | Steven Hardy <shardy@redhat.com> | 2016-08-28 12:18:07 +0100 |
---|---|---|
committer | Emilien Macchi <emilien@redhat.com> | 2016-09-02 00:26:04 +0000 |
commit | e5f0042e47eb4c2b77348dcec0d3d2730e5d9841 (patch) | |
tree | 6a6c643048d4e0ffa2309d9631eb171d268f4873 /manifests/profile/base/glance | |
parent | aaf9dc5b55742cc92fbc8e2e525db00fd7f93104 (diff) |
Make service profiles default to rabbitmq_node_ips
Instead of hard-coded yaml aliases in t-h-t, make each service
profile that requires rabbit default to the list of rabbit ips.
Note this could still be extended in future to e.g enable per
service rabbit clusters, but the default is to lookup the
hiera which should be logically equivalent to current t-h-t.
Change-Id: Ie53c93456529420588eb1927703ea91b54095d87
Partially-Implements: blueprint custom-roles
Diffstat (limited to 'manifests/profile/base/glance')
-rw-r--r-- | manifests/profile/base/glance/api.pp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/manifests/profile/base/glance/api.pp b/manifests/profile/base/glance/api.pp index 845fd41..ecffd7f 100644 --- a/manifests/profile/base/glance/api.pp +++ b/manifests/profile/base/glance/api.pp @@ -27,9 +27,14 @@ # for more details. # Defaults to hiera('step') # +# [*rabbit_hosts*] +# list of the rabbbit host IPs +# Defaults to hiera('rabbitmq_node_ips') + class tripleo::profile::base::glance::api ( $glance_backend = downcase(hiera('glance_backend', 'swift')), $step = hiera('step'), + $rabbit_hosts = hiera('rabbitmq_node_ips', undef), ) { if $step >= 4 { @@ -48,7 +53,9 @@ class tripleo::profile::base::glance::api ( class { '::glance::api': stores => $glance_store, } - include ::glance::notify::rabbitmq + class { '::glance::notify::rabbitmq' : + rabbit_hosts => $rabbit_hosts, + } include join(['::glance::backend::', $glance_backend]) } |