Enable usage of "short names" for Ceph cluster

We're not able to use FQDNs yet, so to work around this, we give
precedence to a "short name" list we'll get from t-h-t. We can
migrate to using FQDNs in the next cycle.

Change-Id: Ic6fec1057439ed9122d44ef294be890d3ff8a8ee
Related-Bug: #1628521

diff --git a/manifests/profile/base/ceph.pp b/manifests/profile/base/ceph.pp
index 6ffd4ef..f4404e0 100644 (file)
--- 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