summaryrefslogtreecommitdiffstats
path: root/manifests/profile/base/manila
diff options
context:
space:
mode:
authorSteven Hardy <shardy@redhat.com>2016-08-28 12:18:07 +0100
committerEmilien Macchi <emilien@redhat.com>2016-09-02 00:26:04 +0000
commite5f0042e47eb4c2b77348dcec0d3d2730e5d9841 (patch)
tree6a6c643048d4e0ffa2309d9631eb171d268f4873 /manifests/profile/base/manila
parentaaf9dc5b55742cc92fbc8e2e525db00fd7f93104 (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/manila')
-rw-r--r--manifests/profile/base/manila/api.pp11
1 files changed, 9 insertions, 2 deletions
diff --git a/manifests/profile/base/manila/api.pp b/manifests/profile/base/manila/api.pp
index 9a3a314..89ff810 100644
--- a/manifests/profile/base/manila/api.pp
+++ b/manifests/profile/base/manila/api.pp
@@ -23,11 +23,18 @@
# 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::manila::api (
- $step = hiera('step'),
+ $step = hiera('step'),
+ $rabbit_hosts = hiera('rabbitmq_node_ips', undef),
) {
if $step >= 4 {
- include ::manila
+ class { '::manila' :
+ rabbit_hosts => $rabbit_hosts,
+ }
include ::manila::api
}
}