Merge "Add missing hiera interpolation calls" into stable/queens

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:

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