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/mistral | |
| 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/mistral')
| -rw-r--r-- | manifests/profile/base/mistral/api.pp | 2 | ||||
| -rw-r--r-- | manifests/profile/base/mistral/engine.pp | 2 | ||||
| -rw-r--r-- | manifests/profile/base/mistral/event_engine.pp | 2 | ||||
| -rw-r--r-- | manifests/profile/base/mistral/executor.pp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/manifests/profile/base/mistral/api.pp b/manifests/profile/base/mistral/api.pp index 4f81725..2ea5c9a 100644 --- a/manifests/profile/base/mistral/api.pp +++ b/manifests/profile/base/mistral/api.pp @@ -53,7 +53,7 @@ class tripleo::profile::base::mistral::api ( $certificates_specs = hiera('apache_certificates_specs', {}), $enable_internal_tls = hiera('enable_internal_tls', false), $mistral_api_network = hiera('mistral_api_network', undef), - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $::hostname == downcase($bootstrap_node) { $sync_db = true diff --git a/manifests/profile/base/mistral/engine.pp b/manifests/profile/base/mistral/engine.pp index b2d8864..95581aa 100644 --- a/manifests/profile/base/mistral/engine.pp +++ b/manifests/profile/base/mistral/engine.pp @@ -29,7 +29,7 @@ # class tripleo::profile::base::mistral::engine ( $bootstrap_node = hiera('bootstrap_nodeid', undef), - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $::hostname == downcase($bootstrap_node) { $sync_db = true diff --git a/manifests/profile/base/mistral/event_engine.pp b/manifests/profile/base/mistral/event_engine.pp index 4214429..f9ea2f8 100644 --- a/manifests/profile/base/mistral/event_engine.pp +++ b/manifests/profile/base/mistral/event_engine.pp @@ -29,7 +29,7 @@ # class tripleo::profile::base::mistral::event_engine ( $bootstrap_node = hiera('bootstrap_nodeid', undef), - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $::hostname == downcase($bootstrap_node) { $sync_db = true diff --git a/manifests/profile/base/mistral/executor.pp b/manifests/profile/base/mistral/executor.pp index 8e3f2c9..cce96dc 100644 --- a/manifests/profile/base/mistral/executor.pp +++ b/manifests/profile/base/mistral/executor.pp @@ -29,7 +29,7 @@ # class tripleo::profile::base::mistral::executor ( $bootstrap_node = hiera('bootstrap_nodeid', undef), - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $::hostname == downcase($bootstrap_node) { $sync_db = true |