From: Michele Baldessari <michele@acksyn.org>
Date: Wed, 25 Jan 2017 13:49:31 +0000 (+0100)
Subject: Fix wrong hiera key in ceph_rbdmirror
X-Git-Tag: opnfv-6.0.0~384
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=3849c6a6d3ab6df2bd1bcac006219a7fb1192f2f;p=apex-puppet-tripleo.git

Fix wrong hiera key in ceph_rbdmirror

There is a typo in the bootstrap check which will lead to:
Could not find data item ceph_rbdmirror_bootstrap_short_node_name in any
Hiera data file and no default supplied at
/etc/puppet/modules/tripleo/manifests/profile/pacemaker/ceph/rbdmirror.pp

We need to be using the correct one:
$ hiera ceph_rbdmirror_short_bootstrap_node_name
overcloud-remote-0

Change-Id: Ic343e5f99e48360bdd2d2989781a4b6ca484e8fc
---

diff --git a/manifests/profile/pacemaker/ceph/rbdmirror.pp b/manifests/profile/pacemaker/ceph/rbdmirror.pp
index 8e2ff77..308572c 100644
--- a/manifests/profile/pacemaker/ceph/rbdmirror.pp
+++ b/manifests/profile/pacemaker/ceph/rbdmirror.pp
@@ -37,7 +37,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::pacemaker::ceph::rbdmirror (
-  $bootstrap_node = hiera('ceph_rbdmirror_bootstrap_short_node_name'),
+  $bootstrap_node = hiera('ceph_rbdmirror_short_bootstrap_node_name'),
   $client_name    = 'openstack',
   $stack_action   = hiera('stack_action'),
   $step           = hiera('step'),