From: Juan Antonio Osorio Robles <jaosorior@redhat.com>
Date: Fri, 3 Mar 2017 09:08:38 +0000 (+0200)
Subject: etcd: Get FQDN from hiera instead of puppet fact
X-Git-Tag: opnfv-6.0.0~965^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=1792712f32cee2d6e557e13acef4c2ca58e17a70;p=apex-tripleo-heat-templates.git

etcd: Get FQDN from hiera instead of puppet fact

The puppet facts will be removed soon and using the hiera value is
adviced instead.

Change-Id: I318f81abaac997370e950780993dc95cae088327
---

diff --git a/puppet/services/etcd.yaml b/puppet/services/etcd.yaml
index ec87a75a..7cdd8451 100644
--- a/puppet/services/etcd.yaml
+++ b/puppet/services/etcd.yaml
@@ -36,7 +36,7 @@ outputs:
         etcd::etcd_name:
           str_replace:
             template:
-              '"%{::fqdn_$NETWORK}"'
+              "%{hiera('fqdn_$NETWORK')}"
             params:
               $NETWORK: {get_param: [ServiceNetMap, EtcdNetwork]}
         # NOTE: bind IP is found in Heat replacing the network name with the local node IP