openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Fix typos in hiera values 

This patch wraps hiera evaluation values with %{} so they are really evaluated.

Change-Id: I85c45d442392b3c94840a9459f506c2ad9be0f0c
This commit is contained in:
Martin Magr 2019-12-17 21:34:49 +01:00
parent 24f0613d2c
commit 0bbd78b5b2
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
environments/metrics/collectd-write-qdr.yaml
View File

@ -15,8 +15,8 @@ parameter_defaults:
format: JSON
presettle: true
BlockStorageExtraConfig:
tripleo::profile::base::metrics::collectd::amqp_host: "hiera(hiera('block_storage_hostname_resolve_network'))"
tripleo::profile::base::metrics::collectd::amqp_host: "%{hiera(hiera('block_storage_hostname_resolve_network'))}"
CephStorageExtraConfig:
tripleo::profile::base::metrics::collectd::amqp_host: "hiera(hiera('ceph_storage_hostname_resolve_network'))"
tripleo::profile::base::metrics::collectd::amqp_host: "%{hiera(hiera('ceph_storage_hostname_resolve_network'))}"
ObjectStorageExtraConfig:
tripleo::profile::base::metrics::collectd::amqp_host: "hiera(hiera('object_storage_hostname_resolve_network'))"
tripleo::profile::base::metrics::collectd::amqp_host: "%{hiera(hiera('object_storage_hostname_resolve_network'))}"

6
environments/metrics/qdr-edge-only.yaml
View File

@ -11,11 +11,11 @@ parameter_defaults:
tripleo::profile::base::metrics::qdr::interior_mesh_nodes: []
tripleo::profile::base::metrics::qdr::router_mode: edge
BlockStorageExtraConfig:
tripleo::profile::base::metrics::qdr::listener_addr: "hiera(hiera('block_storage_hostname_resolve_network'))"
tripleo::profile::base::metrics::qdr::listener_addr: "%{hiera(hiera('block_storage_hostname_resolve_network'))}"
CephStorageExtraConfig:
tripleo::profile::base::metrics::qdr::listener_addr: "hiera(hiera('ceph_storage_hostname_resolve_network'))"
tripleo::profile::base::metrics::qdr::listener_addr: "%{hiera(hiera('ceph_storage_hostname_resolve_network'))}"
ObjectStorageExtraConfig:
tripleo::profile::base::metrics::qdr::listener_addr: "hiera(hiera('object_storage_hostname_resolve_network'))"
tripleo::profile::base::metrics::qdr::listener_addr: "%{hiera(hiera('object_storage_hostname_resolve_network'))}"
#MetricsQdrConnectors:
# - host: qdr-normal-sa-telemetry.apps.remote.tld
# port: 443

6
environments/metrics/qdr-form-controller-mesh.yaml
View File

@ -12,11 +12,11 @@ parameter_defaults:
ControllerExtraConfig:
tripleo::profile::base::metrics::qdr::router_mode: interior
BlockStorageExtraConfig:
tripleo::profile::base::metrics::qdr::listener_addr: "hiera(hiera('block_storage_hostname_resolve_network'))"
tripleo::profile::base::metrics::qdr::listener_addr: "%{hiera(hiera('block_storage_hostname_resolve_network'))}"
CephStorageExtraConfig:
tripleo::profile::base::metrics::qdr::listener_addr: "hiera(hiera('ceph_storage_hostname_resolve_network'))"
tripleo::profile::base::metrics::qdr::listener_addr: "%{hiera(hiera('ceph_storage_hostname_resolve_network'))}"
ObjectStorageExtraConfig:
tripleo::profile::base::metrics::qdr::listener_addr: "hiera(hiera('object_storage_hostname_resolve_network'))"
tripleo::profile::base::metrics::qdr::listener_addr: "%{hiera(hiera('object_storage_hostname_resolve_network'))}"
#MetricsQdrConnectors:
# - host: qdr-normal-sa-telemetry.apps.remote.tld
# port: 443