diff options
| author |   Steve Baker <sbaker@redhat.com> | 2017-05-22 10:40:14 +1200 |
|---|---|---|
| committer | Steve Baker <sbaker@redhat.com> | 2017-06-14 14:31:52 +1200 |
| commit | 94f13e66089cc0b18d5b4b2f6e204160d836ac3e (patch) | |
| tree | 2974f79a71d44705c1791b258afe9b3250667bb5 /manifests/profile/base/aodh | |
| parent | 2561fa9560e80e6f6cf9c6c1f1424491cfb012d9 (diff) | |
Ensure hiera step value is an integer
The step is typically set with the hieradata setting an integer value:
{"step": 1}
However it would be useful for the value to be a string so that
substitutions are possible, for example:
{"step": "%{::step}"}
This change ensures the step parameter defaults to an integer by
calling Integer(hiera('step'))
This change was made by manually removing the undef defaults from
fluentd.pp, uchiwa.pp, and sensu.pp then bulk updating with:
find ./ -type f -print0 |xargs -0 sed -i "s/= hiera('step')/= Integer(hiera('step'))/"
Change-Id: I8a47ca53a7dea8391103abcb8960a97036a6f5b3
Diffstat (limited to 'manifests/profile/base/aodh')
| -rw-r--r-- | manifests/profile/base/aodh/api.pp | 2 | ||||
| -rw-r--r-- | manifests/profile/base/aodh/evaluator.pp | 2 | ||||
| -rw-r--r-- | manifests/profile/base/aodh/listener.pp | 2 | ||||
| -rw-r--r-- | manifests/profile/base/aodh/notifier.pp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/manifests/profile/base/aodh/api.pp b/manifests/profile/base/aodh/api.pp index 5c539fc..300c0ca 100644 --- a/manifests/profile/base/aodh/api.pp +++ b/manifests/profile/base/aodh/api.pp @@ -49,7 +49,7 @@ class tripleo::profile::base::aodh::api ( $aodh_network = hiera('aodh_api_network', undef), $certificates_specs = hiera('apache_certificates_specs', {}), $enable_internal_tls = hiera('enable_internal_tls', false), - $step = hiera('step'), + $step = Integer(hiera('step')), ) { include ::tripleo::profile::base::aodh diff --git a/manifests/profile/base/aodh/evaluator.pp b/manifests/profile/base/aodh/evaluator.pp index d9b48b3..1b25b37 100644 --- a/manifests/profile/base/aodh/evaluator.pp +++ b/manifests/profile/base/aodh/evaluator.pp @@ -24,7 +24,7 @@ # Defaults to hiera('step') # class tripleo::profile::base::aodh::evaluator ( - $step = hiera('step'), + $step = Integer(hiera('step')), ) { include ::tripleo::profile::base::aodh diff --git a/manifests/profile/base/aodh/listener.pp b/manifests/profile/base/aodh/listener.pp index d36e1bb..d225e71 100644 --- a/manifests/profile/base/aodh/listener.pp +++ b/manifests/profile/base/aodh/listener.pp @@ -24,7 +24,7 @@ # Defaults to hiera('step') # class tripleo::profile::base::aodh::listener ( - $step = hiera('step'), + $step = Integer(hiera('step')), ) { include ::tripleo::profile::base::aodh diff --git a/manifests/profile/base/aodh/notifier.pp b/manifests/profile/base/aodh/notifier.pp index d2a3945..bb79ed2 100644 --- a/manifests/profile/base/aodh/notifier.pp +++ b/manifests/profile/base/aodh/notifier.pp @@ -24,7 +24,7 @@ # Defaults to hiera('step') # class tripleo::profile::base::aodh::notifier ( - $step = hiera('step'), + $step = Integer(hiera('step')), ) { include ::tripleo::profile::base::aodh |