openstack/puppet-tripleo
Code Issues Proposed changes

Quote the hiera dot notation

Browse Source 
With puppet 5, dots mean something special in hiera. You can still use
hiera lookups with dots but you need to quote the key part.

https://puppet.com/docs/puppet/5.4/hiera_automatic.html#hiera-dotted-notation

Change-Id: I94831c09821f519b81016f943a251a5b12d72750
This commit is contained in:
Alex Schultz 2019-06-14 14:57:23 -06:00
parent d3796a69dd
commit 526d040c39
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/firewall/service_rules.pp
View File

@ -29,7 +29,7 @@ define tripleo::firewall::service_rules ($service_name = $title) {
# This allows each composable service to load its own custom rules by
# creating its own flat hiera key named:
# tripleo.<service name with underscores>.firewall_rules
$dots_rules = hiera("tripleo.${underscore_name}.firewall_rules", {})
$dots_rules = hiera("'tripleo.${underscore_name}.firewall_rules'", {})
# Supports standard "::" notation:
# tripleo::<service name with underscores>::firewall_rules

4
manifests/haproxy/service_endpoints.pp
View File

@ -30,8 +30,8 @@ define tripleo::haproxy::service_endpoints ($service_name = $title) {
# creating its own flat hiera key named:
# tripleo.<service name with underscores>.haproxy_endpoints
# tripleo.<service name with underscores>.haproxy_userlists
$dots_endpoints = hiera("tripleo.${underscore_name}.haproxy_endpoints", {})
$dots_userlists = hiera("tripleo.${underscore_name}.haproxy_userlists", {})
$dots_endpoints = hiera("'tripleo.${underscore_name}.haproxy_endpoints'", {})
$dots_userlists = hiera("'tripleo.${underscore_name}.haproxy_userlists'", {})
# Supports standard "::" notation
# tripleo::<service name with underscores>::haproxy_endpoints

2
manifests/profile/base/metrics/collectd/collectd_service.pp
View File

@ -2,7 +2,7 @@
# in the hiera data provided by THT.
define tripleo::profile::base::metrics::collectd::collectd_service (
) {
$plugins = hiera("tripleo.collectd.plugins.${title}", [])
$plugins = hiera("'tripleo.collectd.plugins.${title}'", [])
if $plugins {
::tripleo::profile::base::metrics::collectd::collectd_plugin {