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>
This commit is contained in:
Bogdan Dobrelya 2018-04-17 16:39:43 +02:00
parent 70700644b0
commit 2e224ddaaa
3 changed files with 13 additions and 4 deletions

View File

@ -90,7 +90,12 @@ outputs:
tripleo::profile::base::novajoin::oslomsg_rpc_username: {get_param: RabbitUserName} tripleo::profile::base::novajoin::oslomsg_rpc_username: {get_param: RabbitUserName}
tripleo::profile::base::novajoin::oslomsg_use_ssl: {get_param: RabbitClientUseSSL} tripleo::profile::base::novajoin::oslomsg_use_ssl: {get_param: RabbitClientUseSSL}
tripleo::profile::base::novajoin::service_password: {get_param: NovajoinPassword} 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::join_listen_port: 9090
nova::metadata::novajoin::api::keystone_auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]} nova::metadata::novajoin::api::keystone_auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
# We will rely on the host being enrolled for this # We will rely on the host being enrolled for this

View File

@ -64,7 +64,11 @@ outputs:
- 6379 - 6379
- 26379 - 26379
tripleo::profile::base::database::redis::tls_proxy_bind_ip: 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: tripleo::profile::base::database::redis::tls_proxy_fqdn:
str_replace: str_replace:
template: template:

View File

@ -68,9 +68,9 @@ outputs:
snmp::snmpd_options: {get_param: SnmpdOptions} snmp::snmpd_options: {get_param: SnmpdOptions}
snmpd_network: snmpd_network:
str_replace: str_replace:
template: "NETWORK_subnet" template: "%{hiera('$NETWORK_subnet')}"
params: params:
NETWORK: {get_param: [ServiceNetMap, SnmpdNetwork]} $NETWORK: {get_param: [ServiceNetMap, SnmpdNetwork]}
tripleo.snmp.firewall_rules: tripleo.snmp.firewall_rules:
'124 snmp': '124 snmp':
dport: 161 dport: 161