aboutsummaryrefslogtreecommitdiffstats
path: root/manifests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-10-06 11:55:13 +0000
committerGerrit Code Review <review@openstack.org>2016-10-06 11:55:13 +0000
commit5efa62788b0265dd86f0d408b78c32c24b18a175 (patch)
tree684debde0063790c394580334704fa4f361cf9bf /manifests
parent582a212f42f0074a2ef0b73e0032d99adfdb1de0 (diff)
parent0d2d2f342bdb8832925356489bc88c2ccd9514d4 (diff)
Merge "Enable usage of "short names" for Ceph cluster"
Diffstat (limited to 'manifests')
-rw-r--r--manifests/profile/base/ceph.pp17
1 files changed, 11 insertions, 6 deletions
diff --git a/manifests/profile/base/ceph.pp b/manifests/profile/base/ceph.pp
index 6ffd4ef..f4404e0 100644
--- a/manifests/profile/base/ceph.pp
+++ b/manifests/profile/base/ceph.pp
@@ -20,7 +20,7 @@
#
# [*ceph_mon_initial_members*]
# (Optional) List of IP addresses to use as mon_initial_members
-# Defaults to hiera('ceph_mon_node_names')
+# Defaults to hiera('ceph_mon_short_node_names')
#
# [*ceph_mon_host*]
# (Optional) List of IP addresses to use as mon_host
@@ -36,18 +36,23 @@
# Defaults to hiera('step')
#
class tripleo::profile::base::ceph (
- $ceph_mon_initial_members = hiera('ceph_mon_node_names', undef),
+ $ceph_mon_initial_members = hiera('ceph_mon_short_node_names', undef),
$ceph_mon_host = hiera('ceph_mon_node_ips', '127.0.0.1'),
$enable_ceph_storage = false,
$step = hiera('step'),
) {
+ if ! $ceph_mon_initial_members {
+ $ceph_mon_initial_members_real = hiera('ceph_mon_node_names', undef)
+ } else {
+ $ceph_mon_initial_members_real = $ceph_mon_initial_members
+ }
if $step >= 2 {
- if $ceph_mon_initial_members {
- if is_array($ceph_mon_initial_members) {
- $mon_initial_members = downcase(join($ceph_mon_initial_members, ','))
+ if $ceph_mon_initial_members_real {
+ if is_array($ceph_mon_initial_members_real) {
+ $mon_initial_members = downcase(join($ceph_mon_initial_members_real, ','))
} else {
- $mon_initial_members = downcase($ceph_mon_initial_members)
+ $mon_initial_members = downcase($ceph_mon_initial_members_real)
}
} else {
$mon_initial_members = undef