openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Replace hiera by lookup"

Browse Source
This commit is contained in:
Zuul
2022-04-19 21:18:49 +00:00
committed by Gerrit Code Review
parent 5d0201d547 ff83505e8a
commit 946c36233a
67 changed files with 148 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
deployment/heat/heat-api-cfn-container-puppet.yaml
View File

@@ -140,7 +140,7 @@ outputs:
heat::api_cfn::bind_host:
str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, HeatApiCfnNetwork]}
heat::wsgi::apache_api_cfn::ssl: {get_param: EnableInternalTLS}
@@ -153,13 +153,13 @@ outputs:
heat::wsgi::apache_api_cfn::bind_host:
str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, HeatApiCfnNetwork]}
heat::wsgi::apache_api_cfn::servername:
str_replace:
template:
"%{hiera('fqdn_$NETWORK')}"
"%{lookup('fqdn_$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, HeatApiCfnNetwork]}
- if:

6
deployment/heat/heat-api-container-puppet.yaml
View File

@@ -168,7 +168,7 @@ outputs:
heat::api::bind_host:
str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, HeatApiNetwork]}
heat::wsgi::apache_api::ssl: {get_param: EnableInternalTLS}
@@ -183,13 +183,13 @@ outputs:
heat::wsgi::apache_api::bind_host:
str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, HeatApiNetwork]}
heat::wsgi::apache_api::servername:
str_replace:
template:
"%{hiera('fqdn_$NETWORK')}"
"%{lookup('fqdn_$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, HeatApiNetwork]}
- if: