From 2e224ddaaac2f37084c6c46b7157f2aa26b1d711 Mon Sep 17 00:00:00 2001
From: Bogdan Dobrelya <bdobreli@redhat.com>
Date: Tue, 17 Apr 2018 16:39:43 +0200
Subject: [PATCH] Add missing hiera interpolation calls

Complements [0], [1]

[0] https://review.openstack.org/#/c/526692
[1] https://review.openstack.org/#/c/561498

Related-bug: #1742915

Change-Id: I57859178988e92f926b6c41370afd8b0d1552831
Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
---
 docker/services/novajoin.yaml       | 7 ++++++-
 puppet/services/database/redis.yaml | 6 +++++-
 puppet/services/snmp.yaml           | 4 ++--
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/docker/services/novajoin.yaml b/docker/services/novajoin.yaml
index a5c35af107..741cc09bdd 100644
--- a/docker/services/novajoin.yaml
+++ b/docker/services/novajoin.yaml
@@ -90,7 +90,12 @@ outputs:
         tripleo::profile::base::novajoin::oslomsg_rpc_username: {get_param: RabbitUserName}
         tripleo::profile::base::novajoin::oslomsg_use_ssl: {get_param: RabbitClientUseSSL}
         tripleo::profile::base::novajoin::service_password: {get_param: NovajoinPassword}
-        nova::metadata::novajoin::api::bind_address: {get_param: [ServiceNetMap, NovajoinNetwork]}
+        nova::metadata::novajoin::api::bind_address:
+          str_replace:
+             template:
+               "%{hiera('$NETWORK')}"
+             params:
+               $NETWORK:  {get_param: [ServiceNetMap, NovajoinNetwork]}
         nova::metadata::novajoin::api::join_listen_port: 9090
         nova::metadata::novajoin::api::keystone_auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
         # We will rely on the host being enrolled for this
diff --git a/puppet/services/database/redis.yaml b/puppet/services/database/redis.yaml
index 34b42cfef1..754625f108 100644
--- a/puppet/services/database/redis.yaml
+++ b/puppet/services/database/redis.yaml
@@ -64,7 +64,11 @@ outputs:
                   - 6379
                   - 26379
             tripleo::profile::base::database::redis::tls_proxy_bind_ip:
-              get_param: [ServiceNetMap, RedisNetwork]
+              str_replace:
+                template:
+                  "%{hiera('$NETWORK')}"
+                params:
+                  $NETWORK: {get_param: [ServiceNetMap, RedisNetwork]}
             tripleo::profile::base::database::redis::tls_proxy_fqdn:
               str_replace:
                 template:
diff --git a/puppet/services/snmp.yaml b/puppet/services/snmp.yaml
index 29d1312181..4eac6dd704 100644
--- a/puppet/services/snmp.yaml
+++ b/puppet/services/snmp.yaml
@@ -68,9 +68,9 @@ outputs:
         snmp::snmpd_options: {get_param: SnmpdOptions}
         snmpd_network:
           str_replace:
-            template: "NETWORK_subnet"
+            template: "%{hiera('$NETWORK_subnet')}"
             params:
-              NETWORK: {get_param: [ServiceNetMap, SnmpdNetwork]}
+              $NETWORK: {get_param: [ServiceNetMap, SnmpdNetwork]}
         tripleo.snmp.firewall_rules:
           '124 snmp':
             dport: 161