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
commit 946c36233a
67 changed files with 148 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deployment/aodh/aodh-api-container-puppet.yaml
View File

@ -190,7 +190,7 @@ outputs:
aodh::wsgi::apache::servername:
str_replace:
template:
"%{hiera('fqdn_$NETWORK')}"
"%{lookup('fqdn_$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, AodhApiNetwork]}
aodh::wsgi::apache::wsgi_process_display_name: 'aodh_wsgi'
@ -217,7 +217,7 @@ outputs:
aodh::wsgi::apache::bind_host:
str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, AodhApiNetwork]}
aodh::alarm_history_time_to_live: {get_param: AodhAlarmHistoryTTL}

2
deployment/apache/apache-baremetal-puppet.j2.yaml
View File

@ -91,7 +91,7 @@ outputs:
- apache::ip:
str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, ApacheNetwork]}
apache::default_vhost: false

4
deployment/barbican/barbican-api-container-puppet.yaml
View File

@ -279,7 +279,7 @@ outputs:
barbican::wsgi::apache::bind_host:
str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, BarbicanApiNetwork]}
barbican::wsgi::apache::ssl: {get_param: EnableInternalTLS}
@ -287,7 +287,7 @@ outputs:
barbican::wsgi::apache::servername:
str_replace:
template:
"%{hiera('fqdn_$NETWORK')}"
"%{lookup('fqdn_$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, BarbicanApiNetwork]}
barbican::db::database_connection:

2
deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml
View File

@ -148,7 +148,7 @@ outputs:
- tripleo::profile::base::ceilometer::agent::notification::notifier_host_addr:
str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK:
get_param:

2
deployment/ceilometer/ceilometer-base-container-puppet.yaml
View File

@ -102,7 +102,7 @@ outputs:
ceilometer::telemetry_secret: {get_param: CeilometerMeteringSecret}
ceilometer::snmpd_readonly_username: {get_param: SnmpdReadonlyUserName}
ceilometer::snmpd_readonly_user_password: {get_param: SnmpdReadonlyUserPassword}
ceilometer::host: "%{hiera('fqdn_canonical')}"
ceilometer::host: "%{lookup('fqdn_canonical')}"
ceilometer::rpc_response_timeout: {get_param: CeilometerRpcResponseTimeout}
ceilometer::db::sync_db: false
service_config_settings:

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

@ -208,7 +208,7 @@ outputs:
cinder::api::bind_host:
str_replace:
template:
"%{hiera('fqdn_$NETWORK')}"
"%{lookup('fqdn_$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, CinderApiNetwork]}
cinder::wsgi::apache::ssl: {get_param: EnableInternalTLS}
@ -221,13 +221,13 @@ outputs:
cinder::wsgi::apache::bind_host:
str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, CinderApiNetwork]}
cinder::wsgi::apache::servername:
str_replace:
template:
"%{hiera('fqdn_$NETWORK')}"
"%{lookup('fqdn_$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, CinderApiNetwork]}
cinder::wsgi::apache::vhost_custom_fragment:

2
deployment/cinder/cinder-backend-nvmeof-puppet.yaml
View File

@ -73,7 +73,7 @@ outputs:
tripleo::profile::base::cinder::volume::nvmeof::target_ip_address:
str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, CinderIscsiNetwork]}
- if:

4
deployment/cinder/cinder-volume-container-puppet.yaml
View File

@ -282,7 +282,7 @@ outputs:
tripleo::profile::base::cinder::volume::iscsi::cinder_iscsi_address:
str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, CinderIscsiNetwork]}
- if:
@ -299,7 +299,7 @@ outputs:
- tripleo::profile::base::cinder::volume::etcd_host:
str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, EtcdNetwork]}
service_config_settings:

4
deployment/database/mysql-base.yaml
View File

@ -129,13 +129,13 @@ outputs:
mysql_bind_host:
str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, MysqlNetwork]}
tripleo::profile::base::database::mysql::bind_address:
str_replace:
template:
"%{hiera('fqdn_$NETWORK')}"
"%{lookup('fqdn_$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, MysqlNetwork]}
tripleo::profile::base::database::mysql::certificate_specs:

2
deployment/database/mysql-client.yaml
View File

@ -45,7 +45,7 @@ outputs:
tripleo::profile::base::database::mysql::client::mysql_client_bind_address:
str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, MysqlNetwork]}
tripleo::profile::base::database::mysql::client::enable_ssl: {get_param: EnableInternalTLS}

6
deployment/database/mysql-pacemaker-puppet.yaml
View File

@ -140,7 +140,7 @@ outputs:
- tripleo::profile::pacemaker::database::mysql::bind_address:
str_replace:
template:
"%{hiera('fqdn_$NETWORK')}"
"%{lookup('fqdn_$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, MysqlNetwork]}
# NOTE: bind IP is found in hiera replacing the network name with the
@ -152,7 +152,7 @@ outputs:
tripleo::profile::pacemaker::database::mysql::gmcast_listen_addr:
str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, MysqlNetwork]}
tripleo::profile::pacemaker::database::mysql::ca_file:
@ -175,7 +175,7 @@ outputs:
tripleo::profile::pacemaker::database::mysql_bundle::bind_address:
str_replace:
template:
"%{hiera('fqdn_$NETWORK')}"
"%{lookup('fqdn_$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, MysqlNetwork]}
tripleo::profile::pacemaker::database::mysql_bundle::ca_file:

2
deployment/database/redis-base-puppet.yaml
View File

@ -106,7 +106,7 @@ outputs:
- '127.0.0.1'
- str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, RedisNetwork]}
redis::port: 6379

4
deployment/database/redis-container-puppet.yaml
View File

@ -106,13 +106,13 @@ outputs:
- tripleo::profile::base::database::redis::tls_proxy_bind_ip:
str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, RedisNetwork]}
tripleo::profile::base::database::redis::tls_proxy_fqdn:
str_replace:
template:
"%{hiera('fqdn_$NETWORK')}"
"%{lookup('fqdn_$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, RedisNetwork]}
tripleo::profile::base::database::redis::tls_proxy_port: 6379

8
deployment/database/redis-pacemaker-puppet.yaml
View File

@ -155,26 +155,26 @@ outputs:
tripleo::profile::pacemaker::database::redis_bundle::tls_proxy_bind_ip:
str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, RedisNetwork]}
tripleo::profile::pacemaker::database::redis_bundle::tls_proxy_fqdn:
str_replace:
template:
"%{hiera('fqdn_$NETWORK')}"
"%{lookup('fqdn_$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, RedisNetwork]}
tripleo::profile::pacemaker::database::redis_bundle::tls_proxy_port: 6379
tripleo::profile::pacemaker::database::redis::tls_proxy_bind_ip:
str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, RedisNetwork]}
tripleo::profile::pacemaker::database::redis::tls_proxy_fqdn:
str_replace:
template:
"%{hiera('fqdn_$NETWORK')}"
"%{lookup('fqdn_$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, RedisNetwork]}
tripleo::profile::pacemaker::database::redis::tls_proxy_port: 6379

8
deployment/deprecated/nova/nova-libvirt-container-puppet.yaml
View File

@ -413,7 +413,7 @@ outputs:
nova::compute::libvirt::vncserver_listen:
str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, NovaLibvirtNetwork]}
nova::compute::libvirt::log_filters: {get_param: LibvirtLogFilters}
@ -433,19 +433,19 @@ outputs:
nova::migration::libvirt::listen_address:
str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, NovaLibvirtNetwork]}
nova::migration::libvirt::live_migration_inbound_addr:
str_replace:
template:
"%{hiera('fqdn_$NETWORK')}"
"%{lookup('fqdn_$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, NovaLibvirtNetwork]}
- nova::migration::libvirt::live_migration_inbound_addr:
str_replace:
template:
"%{hiera('fqdn_$NETWORK')}"
"%{lookup('fqdn_$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, NovaLibvirtNetwork]}
- if:

4
deployment/designate/designate-api-container-puppet.yaml
View File

@ -144,13 +144,13 @@ outputs:
designate::wsgi::apache::bind_host:
str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, DesignateApiNetwork]}
designate::wsgi::apache::servername:
str_replace:
template:
"%{hiera('fqdn_$NETWORK')}"
"%{lookup('fqdn_$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, DesignateApiNetwork]}
-

2
deployment/designate/designate-mdns-container-puppet.yaml
View File

@ -110,7 +110,7 @@ outputs:
- designate::mdns::listen:
str_replace:
template:
"%{hiera('$NETWORK')}:5354"
"%{lookup('$NETWORK')}:5354"
params:
$NETWORK: {get_param: [ServiceNetMap, DesignateMdnsNetwork]}
- designate::db::database_connection:

4
deployment/etcd/etcd-container-puppet.yaml
View File

@ -133,13 +133,13 @@ outputs:
- etcd::etcd_name:
str_replace:
template:
"%{hiera('fqdn_$NETWORK')}"
"%{lookup('fqdn_$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, EtcdNetwork]}
tripleo::profile::base::etcd::bind_ip:
str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, EtcdNetwork]}
tripleo::profile::base::etcd::client_port: '2379'

8
deployment/glance/glance-api-container-puppet.yaml
View File

@ -552,13 +552,13 @@ outputs:
tripleo::profile::base::glance::api::tls_proxy_bind_ip:
str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, GlanceApiNetwork]}
tripleo::profile::base::glance::api::tls_proxy_fqdn:
str_replace:
template:
"%{hiera('fqdn_$NETWORK')}"
"%{lookup('fqdn_$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, GlanceApiNetwork]}
tripleo::profile::base::glance::api::tls_proxy_port:
@ -568,10 +568,10 @@ outputs:
glance::api::bind_host:
if:
- {get_param: EnableInternalTLS}
- "%{hiera('localhost_address')}"
- "%{lookup('localhost_address')}"
- str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, GlanceApiNetwork]}
glance_notifier_strategy: {get_param: GlanceNotifierStrategy}

4
deployment/glance/glance-api-edge-container-puppet.yaml
View File

@ -55,12 +55,12 @@ outputs:
- {get_param: EnableInternalTLS}
- str_replace:
template:
"https://%{hiera('fqdn_NETWORK')}:9292"
"https://%{lookup('fqdn_NETWORK')}:9292"
params:
NETWORK: {get_param: [ServiceNetMap, GlanceApiEdgeNetwork]}
- str_replace:
template:
"http://%{hiera('NETWORK_uri')}:9292"
"http://%{lookup('NETWORK_uri')}:9292"
params:
NETWORK: {get_param: [ServiceNetMap, GlanceApiEdgeNetwork]}

4
deployment/gnocchi/gnocchi-api-container-puppet.yaml
View File

@ -235,7 +235,7 @@ outputs:
gnocchi::wsgi::apache::servername:
str_replace:
template:
"%{hiera('fqdn_$NETWORK')}"
"%{lookup('fqdn_$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, GnocchiApiNetwork]}
tripleo::profile::base::gnocchi::api::gnocchi_backend: {get_param: GnocchiBackend}
@ -250,7 +250,7 @@ outputs:
gnocchi::wsgi::apache::bind_host:
str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, GnocchiApiNetwork]}
gnocchi::wsgi::apache::wsgi_process_display_name: 'gnocchi_wsgi'

2
deployment/haproxy/haproxy-container-puppet.yaml
View File

@ -191,7 +191,7 @@ outputs:
tripleo::haproxy::haproxy_stats_bind_address:
str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, HaproxyNetwork]}
tripleo::haproxy::redis_password: {get_param: RedisPassword}

6
deployment/haproxy/haproxy-edge-container-puppet.yaml
View File

@ -54,12 +54,12 @@ outputs:
- {get_param: EnableInternalTLS}
- str_replace:
template:
"https://%{hiera('fqdn_NETWORK')}:9292"
"https://%{lookup('fqdn_NETWORK')}:9292"
params:
NETWORK: {get_param: [ServiceNetMap, GlanceApiEdgeNetwork]}
- str_replace:
template:
"http://%{hiera('NETWORK_uri')}:9292"
"http://%{lookup('NETWORK_uri')}:9292"
params:
NETWORK: {get_param: [ServiceNetMap, GlanceApiEdgeNetwork]}
@ -87,7 +87,7 @@ outputs:
glance_api_vip:
str_replace:
template:
"%{hiera('NETWORK')}"
"%{lookup('NETWORK')}"
params:
NETWORK: {get_param: [ServiceNetMap, GlanceApiEdgeNetwork]}
glance_api_node_ips: "%{alias('glance_api_edge_node_ips')}"

2
deployment/haproxy/haproxy-pacemaker-puppet.yaml
View File

@ -299,7 +299,7 @@ outputs:
changed_when: puppet_host_outputs.rc == 2
failed_when: false
vars:
puppet_execute: "if hiera('enable_load_balancer', true) { class {'::tripleo::haproxy': use_internal_certificates => false, manage_firewall => hiera('tripleo::firewall::manage_firewall', true), }}"
puppet_execute: "if lookup('enable_load_balancer', undef, undef, true) { class {'::tripleo::haproxy': use_internal_certificates => false, manage_firewall => lookup('tripleo::firewall::manage_firewall', undef, undef, true), }}"
puppet_tags: tripleo::firewall::rule
puppet_modulepath: /etc/puppet/modules:/opt/stack/puppet-modules:/usr/share/openstack-puppet/modules
puppet_debug: {get_param: ConfigDebug}

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:

4
deployment/horizon/horizon-container-puppet.yaml
View File

@ -212,7 +212,7 @@ outputs:
horizon::bind_address:
str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, HorizonNetwork]}
horizon::keystone_url: {get_param: [EndpointMap, KeystoneV3Public, uri]}
@ -225,7 +225,7 @@ outputs:
horizon::servername:
str_replace:
template:
"%{hiera('fqdn_$NETWORK')}"
"%{lookup('fqdn_$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, HorizonNetwork]}
horizon::listen_ssl: {get_param: EnableInternalTLS}

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

@ -195,7 +195,7 @@ outputs:
ironic::api::host_ip:
str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, IronicApiNetwork]}
ironic::api::port: {get_param: [EndpointMap, IronicInternal, port]}
@ -213,14 +213,14 @@ outputs:
ironic::wsgi::apache::bind_host:
str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, IronicApiNetwork]}
ironic::wsgi::apache::port: {get_param: [EndpointMap, IronicInternal, port]}
ironic::wsgi::apache::servername:
str_replace:
template:
"%{hiera('fqdn_$NETWORK')}"
"%{lookup('fqdn_$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, IronicApiNetwork]}
ironic::wsgi::apache::ssl: {get_param: EnableInternalTLS}

10
deployment/ironic/ironic-conductor-container-puppet.yaml
View File

@ -442,14 +442,14 @@ outputs:
ironic_conductor_http_host:
str_replace:
template:
"%{hiera('$NETWORK_uri')}"
"%{lookup('$NETWORK_uri')}"
params:
$NETWORK: {get_param: [ServiceNetMap, IronicNetwork]}
ironic::conductor::http_url:
list_join:
- ''
- - 'http://'
- "%{hiera('ironic_conductor_http_host')}:"
- "%{lookup('ironic_conductor_http_host')}:"
- {get_param: IronicIPXEPort}
ironic::drivers::pxe::ipxe_timeout: {get_param: IronicIPXETimeout}
# NOTE: bind IP is found in hiera replacing the network name with the
@ -461,13 +461,13 @@ outputs:
ironic::drivers::pxe::tftp_server:
str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, IronicNetwork]}
ironic::pxe::tftp_bind_host:
str_replace:
template:
"%{hiera('$NETWORK_uri')}"
"%{lookup('$NETWORK_uri')}"
params:
$NETWORK: {get_param: [ServiceNetMap, IronicNetwork]}
ironic::drivers::agent::deploy_logs_storage_backend: {get_param: IronicDeployLogsStorageBackend}
@ -500,7 +500,7 @@ outputs:
ironic::my_ip:
str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, IronicNetwork]}
ironic::pxe::common::http_port: {get_param: IronicIPXEPort}

4
deployment/ironic/ironic-inspector-container-puppet.yaml
View File

@ -300,13 +300,13 @@ outputs:
- ironic::inspector::listen_address:
str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, IronicInspectorNetwork]}
ironic::inspector::dnsmasq_local_ip:
str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, IronicInspectorNetwork]}
tripleo::profile::base::ironic_inspector::inspection_subnets:

6
deployment/keystone/keystone-container-puppet.yaml
View File

@ -578,7 +578,7 @@ outputs:
keystone::wsgi::apache::servername:
str_replace:
template:
"%{hiera('fqdn_$NETWORK')}"
"%{lookup('fqdn_$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, KeystonePublicApiNetwork]}
keystone::wsgi::apache::workers: {get_param: KeystoneWorkers}
@ -596,12 +596,12 @@ outputs:
keystone::wsgi::apache::bind_host:
- str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, KeystonePublicApiNetwork]}
- str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, KeystoneAdminApiNetwork]}
- keystone::cache::enabled: {get_param: EnableCache}

4
deployment/logging/rsyslog-container-puppet.yaml
View File

@ -172,7 +172,7 @@ outputs:
type: list
list_descriptions:
- constant:
value: "%{hiera('fqdn_canonical')}-"
value: "%{lookup('fqdn_canonical')}-"
- property:
name: timereported
dateFormat: year
@ -257,7 +257,7 @@ outputs:
- host:
str_replace:
template:
"%{hiera('$NETWORK')}:$PORT"
"%{lookup('$NETWORK')}:$PORT"
params:
$PORT:
get_param: MetricsQdrPort

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

@ -218,13 +218,13 @@ outputs:
manila::api::bind_host:
str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, ManilaApiNetwork]}
manila::wsgi::apache::bind_host:
str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, ManilaApiNetwork]}
manila::wsgi::apache::ssl: {get_param: EnableInternalTLS}
@ -246,7 +246,7 @@ outputs:
manila::wsgi::apache::servername:
str_replace:
template:
"%{hiera('fqdn_$NETWORK')}"
"%{lookup('fqdn_$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, ManilaApiNetwork]}
manila::wsgi::apache::workers: {get_param: ManilaWorkers}

10
deployment/memcached/memcached-container-puppet.yaml
View File

@ -185,14 +185,14 @@ outputs:
- '127.0.0.1'
- str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, MemcachedNetwork]}
- if:
- enable_non_tls_port
- - str_replace:
template:
"notls:%{hiera('$NETWORK_uri')}:11211"
"notls:%{lookup('$NETWORK_uri')}:11211"
params:
$NETWORK: {get_param: [ServiceNetMap, MemcachedNetwork]}
- if:
@ -210,7 +210,7 @@ outputs:
- '127.0.0.1'
- str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, MemcachedNetwork]}
memcached::listen_ip_uri:
@ -220,7 +220,7 @@ outputs:
- '127.0.0.1'
- str_replace:
template:
"%{hiera('$NETWORK_uri')}"
"%{lookup('$NETWORK_uri')}"
params:
$NETWORK: {get_param: [ServiceNetMap, MemcachedNetwork]}
memcached::tcp_port: {get_param: MemcachedPort}
@ -252,7 +252,7 @@ outputs:
- memcached
collectd::plugin::memcached::instances:
local:
host: "%{hiera('memcached::listen_ip_uri')}"
host: "%{lookup('memcached::listen_ip_uri')}"
port: # collectd has no support to Memcached+TLS yet.
- if:
- enable_non_tls_port

2
deployment/messaging/rpc-qdrouterd-container-puppet.yaml
View File

@ -130,7 +130,7 @@ outputs:
qdr::listener_addr:
str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, OsloMessagingRpcNetwork]}
tripleo::profile::base::qdr::qdr_listener_port: {get_param: RpcPort}

6
deployment/metrics/collectd-container-puppet.yaml
View File

@ -439,7 +439,7 @@ outputs:
- tripleo::profile::base::metrics::collectd::amqp_host:
str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK:
get_param:
@ -489,7 +489,7 @@ outputs:
get_param: CollectdSensubilityLogLevel
tripleo::profile::base::metrics::collectd::sensubility::client_name:
str_replace:
template: "%{hiera('fqdn_NETWORK')}"
template: "%{lookup('fqdn_NETWORK')}"
params:
NETWORK:
get_param:
@ -500,7 +500,7 @@ outputs:
ROLENAME: {get_param: RoleName}
tripleo::profile::base::metrics::collectd::sensubility::client_address:
str_replace:
template: "%{hiera('NETWORK')}"
template: "%{lookup('NETWORK')}"
params:
NETWORK:
get_param:

4
deployment/metrics/qdr-container-ansible.yaml
View File

@ -300,7 +300,7 @@ outputs:
postsave_cmd: "/usr/bin/certmonger-metrics-qdr-refresh.sh"
hostname:
str_replace:
template: "%{hiera('fqdn_NETWORK')}"
template: "%{lookup('fqdn_NETWORK')}"
params:
NETWORK:
get_param:
@ -311,7 +311,7 @@ outputs:
ROLENAME: {get_param: RoleName}
principal:
str_replace:
template: "metrics_qdr/%{hiera('fqdn_NETWORK')}"
template: "metrics_qdr/%{lookup('fqdn_NETWORK')}"
params:
NETWORK:
get_param:

2
deployment/metrics/qdr-container-puppet.yaml
View File

@ -207,7 +207,7 @@ outputs:
- tripleo::profile::base::metrics::qdr::listener_addr:
str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK:
get_param:

8
deployment/neutron/neutron-api-container-puppet.yaml
View File

@ -393,13 +393,13 @@ outputs:
tripleo::profile::base::neutron::server::tls_proxy_bind_ip:
str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, NeutronApiNetwork]}
tripleo::profile::base::neutron::server::tls_proxy_fqdn:
str_replace:
template:
"%{hiera('fqdn_$NETWORK')}"
"%{lookup('fqdn_$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, NeutronApiNetwork]}
tripleo::profile::base::neutron::server::tls_proxy_port:
@ -409,10 +409,10 @@ outputs:
neutron::bind_host:
if:
- {get_param: EnableInternalTLS}
- "%{hiera('localhost_address')}"
- "%{lookup('localhost_address')}"
- str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, NeutronApiNetwork]}
tripleo::profile::base::neutron::server::l3_ha_override: {get_param: NeutronL3HA}

2
deployment/neutron/neutron-base.yaml
View File

@ -150,7 +150,7 @@ outputs:
neutron::dhcp_agent_notification: {get_param: DhcpAgentNotification}
neutron::dns_domain: {get_param: NeutronDnsDomain}
neutron::rabbit_heartbeat_timeout_threshold: 60
neutron::host: "%{hiera('fqdn_canonical')}"
neutron::host: "%{lookup('fqdn_canonical')}"
neutron::db::database_db_max_retries: -1
neutron::db::database_max_retries: -1
neutron::db::sync::db_sync_timeout: {get_param: DatabaseSyncTimeout}

2
deployment/neutron/neutron-linuxbridge-agent-baremetal-puppet.yaml
View File

@ -75,7 +75,7 @@ outputs:
neutron::agents::ml2::linuxbridge::local_ip:
str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, NeutronTenantNetwork]}
neutron::agents::dhcp::interface_driver: 'neutron.agent.linux.interface.BridgeInterfaceDriver'

2
deployment/neutron/neutron-metadata-container-puppet.yaml
View File

@ -128,7 +128,7 @@ outputs:
neutron::agents::metadata::metadata_host:
str_replace:
template:
"%{hiera('cloud_name_$NETWORK')}"
"%{lookup('cloud_name_$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, NovaMetadataNetwork]}
neutron::agents::metadata::metadata_protocol:

4
deployment/neutron/neutron-ovs-agent-container-puppet.yaml
View File

@ -242,7 +242,7 @@ outputs:
neutron::agents::ml2::ovs::extensions: {get_param: NeutronAgentExtensions}
neutron::agents::ml2::ovs::tunnel_csum: {get_param: NeutronOVSTunnelCsum}
neutron::agents::ml2::ovs::igmp_snooping_enable: {get_param: NeutronEnableIgmpSnooping}
neutron::agents::ml2::ovs::resource_provider_default_hypervisor: "%{hiera('fqdn_canonical')}"
neutron::agents::ml2::ovs::resource_provider_default_hypervisor: "%{lookup('fqdn_canonical')}"
# NOTE: bind IP is found in hiera replacing the network name with the
# local node IP for the given network; replacement examples
# (eg. for internal_api):
@ -252,7 +252,7 @@ outputs:
neutron::agents::ml2::ovs::local_ip:
str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, NeutronTenantNetwork]}
neutron::agents::ml2::ovs::enable_distributed_routing:

2
deployment/neutron/neutron-sriov-agent-container-puppet.yaml
View File

@ -149,7 +149,7 @@ outputs:
- get_attr: [NeutronBase, role_data, config_settings]
- get_attr: [RoleParametersValue, value]
- get_attr: [NeutronLogging, config_settings]
- neutron::agents::ml2::sriov::resource_provider_default_hypervisor: "%{hiera('fqdn_canonical')}"
- neutron::agents::ml2::sriov::resource_provider_default_hypervisor: "%{lookup('fqdn_canonical')}"
puppet_config:
config_volume: neutron
puppet_tags: neutron_config,neutron_agent_sriov_numvfs,neutron_sriov_agent_config

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

@ -369,7 +369,7 @@ outputs:
nova::api::api_bind_address:
str_replace:
template:
"%{hiera('fqdn_$NETWORK')}"
"%{lookup('fqdn_$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, NovaApiNetwork]}
nova::api::service_name: 'httpd'
@ -382,13 +382,13 @@ outputs:
nova::wsgi::apache_api::bind_host:
str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, NovaApiNetwork]}
nova::wsgi::apache_api::servername:
str_replace:
template:
"%{hiera('fqdn_$NETWORK')}"
"%{lookup('fqdn_$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, NovaApiNetwork]}
nova::api::instance_name_template: {get_param: InstanceNameTemplate}

4
deployment/nova/nova-base-puppet.yaml
View File

@ -207,7 +207,7 @@ outputs:
- nova::my_ip:
str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, NovaApiNetwork]}
nova::rabbit_use_ssl: {get_param: RpcUseSSL}
@ -239,7 +239,7 @@ outputs:
nova::cinder::catalog_info: 'volumev3:cinderv3:internalURL'
# NOTE(tkajinam): Make sure the default (services) is overridden
nova::cinder::project_name: 'service'
nova::host: "%{hiera('fqdn_canonical')}"
nova::host: "%{lookup('fqdn_canonical')}"
nova::notify_on_state_change: 'vm_and_task_state'
nova::notification_driver: {get_param: NotificationDriver}
nova::notification_format: 'unversioned'

2
deployment/nova/nova-compute-container-puppet.yaml
View File

@ -1181,7 +1181,7 @@ outputs:
nova::compute::vncserver_proxyclient_address:
str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, NovaLibvirtNetwork]}
nova::compute::vncproxy_host: {get_param: [EndpointMap, NovaPublic, host_nobrackets]}

4
deployment/nova/nova-metadata-container-puppet.yaml
View File

@ -188,13 +188,13 @@ outputs:
nova::wsgi::apache_metadata::bind_host:
str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, NovaMetadataNetwork]}
nova::wsgi::apache_metadata::servername:
str_replace:
template:
"%{hiera('fqdn_$NETWORK')}"
"%{lookup('fqdn_$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, NovaMetadataNetwork]}
nova::wsgi::apache_metadata::workers:

8
deployment/nova/nova-migration-target-container-puppet.yaml
View File

@ -121,18 +121,18 @@ outputs:
- tripleo::profile::base::nova::migration::target::ssh_authorized_keys:
- {get_param: [ MigrationSshKey, public_key ]}
tripleo::profile::base::nova::migration::target::ssh_localaddrs:
- "%{hiera('cold_migration_ssh_inbound_addr')}"
- "%{hiera('live_migration_ssh_inbound_addr')}"
- "%{lookup('cold_migration_ssh_inbound_addr')}"
- "%{lookup('live_migration_ssh_inbound_addr')}"
live_migration_ssh_inbound_addr:
str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, NovaLibvirtNetwork]}
cold_migration_ssh_inbound_addr:
str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, NovaApiNetwork]}
tripleo::profile::base::sshd::port:

8
deployment/nova/nova-modular-libvirt-container-puppet.yaml
View File

@ -439,7 +439,7 @@ outputs:
nova::compute::libvirt::vncserver_listen:
str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, NovaLibvirtNetwork]}
nova::compute::libvirt::log_filters: {get_param: LibvirtLogFilters}
@ -464,19 +464,19 @@ outputs:
nova::migration::libvirt::listen_address:
str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, NovaLibvirtNetwork]}
nova::migration::libvirt::live_migration_inbound_addr:
str_replace:
template:
"%{hiera('fqdn_$NETWORK')}"
"%{lookup('fqdn_$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, NovaLibvirtNetwork]}
- nova::migration::libvirt::live_migration_inbound_addr:
str_replace:
template:
"%{hiera('fqdn_$NETWORK')}"
"%{lookup('fqdn_$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, NovaLibvirtNetwork]}
- if:

2
deployment/nova/nova-vnc-proxy-container-puppet.yaml
View File

@ -197,7 +197,7 @@ outputs:
nova::vncproxy::host:
str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, NovaLibvirtNetwork]}
- if:

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

@ -222,13 +222,13 @@ outputs:
octavia::wsgi::apache::bind_host:
str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, OctaviaApiNetwork]}
octavia::wsgi::apache::servername:
str_replace:
template:
"%{hiera('fqdn_$NETWORK')}"
"%{lookup('fqdn_$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, OctaviaApiNetwork]}
# Bind to localhost if internal TLS is enabled, since we put a TLS
@ -236,7 +236,7 @@ outputs:
octavia::api::host:
str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, OctaviaApiNetwork]}
tripleo::profile::base::octavia::enable_driver_agent: {get_param: OctaviaEnableDriverAgent}

4
deployment/ovn/ovn-controller-container-puppet.yaml
View File

@ -267,12 +267,12 @@ outputs:
ovn::controller::ovn_encap_ip:
str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, NeutronTenantNetwork]}
ovn::controller::ovn_encap_type: {get_param: OVNEncapType}
ovn::controller::ovn_bridge: {get_param: OVNIntegrationBridge}
ovn::controller::hostname: "%{hiera('fqdn_canonical')}"
ovn::controller::hostname: "%{lookup('fqdn_canonical')}"
ovn::controller::ovn_remote_probe_interval: {get_param: OVNRemoteProbeInterval}
ovn::controller::ovn_openflow_probe_interval: {get_param: OVNOpenflowProbeInterval}
nova::compute::force_config_drive: {get_param: OVNMetadataEnabled}

2
deployment/ovn/ovn-dbs-container-puppet.yaml
View File

@ -115,7 +115,7 @@ outputs:
ovn::northd::dbs_listen_ip:
str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, OvnDbsNetwork]}
tripleo::haproxy::ovn_dbs_manage_lb: true

2
deployment/pacemaker/clustercheck-container-puppet.yaml
View File

@ -87,7 +87,7 @@ outputs:
- tripleo::profile::pacemaker::clustercheck::bind_address:
str_replace:
template:
"%{hiera('$FQDN$NETWORK')}"
"%{lookup('$FQDN$NETWORK')}"
params:
$FQDN: {if: ["socat_listener", "", "fqdn_"]}
$NETWORK: {get_param: [ServiceNetMap, MysqlNetwork]}

2
deployment/pacemaker/pacemaker-baremetal-puppet.yaml
View File

@ -164,7 +164,7 @@ outputs:
tripleo::profile::base::pacemaker::pcsd_bind_addr:
str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, PacemakerNetwork]}
tripleo::pacemaker::tls_priorities:

2
deployment/pacemaker/pacemaker-remote-baremetal-puppet.yaml
View File

@ -100,7 +100,7 @@ outputs:
tripleo::profile::base::pacemaker_remote::pcsd_bind_addr:
str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, PacemakerRemoteNetwork]}
pacemaker::corosync::manage_fw: false

4
deployment/placement/placement-api-container-puppet.yaml
View File

@ -197,13 +197,13 @@ outputs:
placement::wsgi::apache::bind_host:
str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, PlacementNetwork]}
placement::wsgi::apache::servername:
str_replace:
template:
"%{hiera('fqdn_$NETWORK')}"
"%{lookup('fqdn_$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, PlacementNetwork]}
placement::db::database_connection:

2
deployment/qdr/qdrouterd-container-puppet.yaml
View File

@ -89,7 +89,7 @@ outputs:
qdr::listener_addr:
str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, QdrNetwork]}
# cannot pass qdr::listener_port directly because it needs to be a string

10
deployment/rabbitmq/rabbitmq-container-puppet.yaml
View File

@ -198,13 +198,13 @@ outputs:
RABBITMQ_NODENAME:
str_replace:
template:
"rabbit@%{hiera('fqdn_$NETWORK')}"
"rabbit@%{lookup('fqdn_$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, RabbitmqNetwork]}
RABBITMQ_USE_LONGNAME: 'true'
RABBITMQ_CTL_DIST_PORT_MIN: '25673'
RABBITMQ_CTL_DIST_PORT_MAX: '25683'
'export ERL_EPMD_ADDRESS': "%{hiera('rabbitmq::interface')}"
'export ERL_EPMD_ADDRESS': "%{lookup('rabbitmq::interface')}"
tripleo::profile::base::rabbitmq::additional_erl_args: {get_param: RabbitAdditionalErlArgs}
rabbitmq_kernel_variables:
inet_dist_listen_min: '25672'
@ -225,7 +225,7 @@ outputs:
rabbitmq::interface:
str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, RabbitmqNetwork]}
rabbitmq::nr_ha_queues: {get_param: RabbitHAQueues}
@ -237,7 +237,7 @@ outputs:
rabbitmq::ssl_interface:
str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, RabbitmqNetwork]}
# TODO(jaosorior): Remove this once we set a proper default in
@ -253,7 +253,7 @@ outputs:
- {get_param: RabbitmqEnableManagementAccess}
- str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, RabbitmqManagementNetwork]}
- 127.0.0.1

4
deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml
View File

@ -140,7 +140,7 @@ outputs:
rabbitmq::interface:
str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, OsloMessagingNotifyNetwork]}
rabbitmq::ssl: {get_param: EnableInternalTLS}
@ -150,7 +150,7 @@ outputs:
rabbitmq::ssl_interface:
str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, OsloMessagingNotifyNetwork]}
tripleo::profile::base::rabbitmq::enable_internal_tls: {get_param: EnableInternalTLS}

4
deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml
View File

@ -140,7 +140,7 @@ outputs:
rabbitmq::interface:
str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, OsloMessagingRpcNetwork]}
rabbitmq::ssl: {get_param: EnableInternalTLS}
@ -150,7 +150,7 @@ outputs:
rabbitmq::ssl_interface:
str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, OsloMessagingRpcNetwork]}
tripleo::profile::base::rabbitmq::enable_internal_tls: {get_param: EnableInternalTLS}

8
deployment/swift/swift-proxy-container-puppet.yaml
View File

@ -269,13 +269,13 @@ outputs:
tripleo::profile::base::swift::proxy::tls_proxy_bind_ip:
str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, SwiftProxyNetwork]}
tripleo::profile::base::swift::proxy::tls_proxy_fqdn:
str_replace:
template:
"%{hiera('fqdn_$NETWORK')}"
"%{lookup('fqdn_$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, SwiftProxyNetwork]}
tripleo::profile::base::swift::proxy::tls_proxy_port:
@ -284,10 +284,10 @@ outputs:
swift::proxy::proxy_local_net_ip:
if:
- {get_param: EnableInternalTLS}
- "%{hiera('localhost_address')}"
- "%{lookup('localhost_address')}"
- str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, SwiftProxyNetwork]}
swift::proxy::cache::tls_enabled: {get_param: MemcachedTLS}

2
deployment/swift/swift-storage-container-puppet.yaml
View File

@ -235,7 +235,7 @@ outputs:
swift::storage::all::storage_local_net_ip:
str_replace:
template:
"%{hiera('$NETWORK')}"
"%{lookup('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, SwiftStorageNetwork]}
rsync::server::pid_file: 'UNSET'

2
environments/enable-stf.yaml
View File

@ -66,7 +66,7 @@ parameter_defaults:
# rather than host IP, ensuring metrics in the dashboard remain uniform
collectd::plugin::memcached::instances:
local:
host: "%{hiera('fqdn_canonical')}"
host: "%{lookup('fqdn_canonical')}"
port: 11211
# The snippet below should be added to a separate yaml file, edited, and

8
environments/metrics/collectd-read-rabbitmq.yaml
View File

@ -9,7 +9,7 @@ parameter_defaults:
collectd::plugin::python::modules:
collectd_rabbitmq_monitoring:
config:
- host: "%{hiera('rabbitmq::interface')}"
port: "%{hiera('rabbitmq::port')}"
username: "%{hiera('rabbitmq::default_user')}"
password: "%{hiera('rabbitmq::default_pass')}"
- host: "%{lookup('rabbitmq::interface')}"
port: "%{lookup('rabbitmq::port')}"
username: "%{lookup('rabbitmq::default_user')}"
password: "%{lookup('rabbitmq::default_pass')}"

8
tools/yaml-validate.py
View File

@ -1047,11 +1047,11 @@ def validate_service_hiera_interpol(f, tpl):
# For the remaining cases, verify if there is a template
# (like str_replace) with the expected format, which is
# containing hiera(param_name) interpolation
# containing lookup(param_name) interpolation
str_replace_pos = _getindex(path, 'str_replace')
params_pos = _getindex(path, 'params')
if str_replace_pos is None or params_pos is None:
print("ERROR: Missed hiera interpolation via str_replace "
print("ERROR: Missed lookup interpolation via str_replace "
"in %s, role_data: %s"
% (f, path))
failed = True
@ -1061,11 +1061,11 @@ def validate_service_hiera_interpol(f, tpl):
param_name = path[params_pos + 1]
str_replace = _get(tpl['outputs']['role_data'],
path[:(str_replace_pos + 1)])
match_interp = re.search("%%\{hiera\(\S+%s\S+\)\}" %
match_interp = re.search("%%\{lookup\(\S+%s\S+\)\}" %
re.escape(param_name),
str_replace['template'])
if str_replace['template'] is None or match_interp is None:
print("ERROR: Missed %%{hiera('... %s ...')} interpolation "
print("ERROR: Missed %%{lookup('... %s ...')} interpolation "
"in str_replace['template'] "
"in %s, role_data: %s" % (param_name, f, path))
failed = True