Browse Source

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

changes/79/692579/1
Zuul 3 months ago
parent
commit
b5ec31dd54
2 changed files with 7 additions and 3 deletions
  1. +5
    -1
      puppet/services/database/redis.yaml
  2. +2
    -2
      puppet/services/snmp.yaml

+ 5
- 1
puppet/services/database/redis.yaml View File

@@ -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:

+ 2
- 2
puppet/services/snmp.yaml View File

@@ -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

Loading…
Cancel
Save