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/octavia | |
| 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/octavia')
| -rw-r--r-- | manifests/profile/base/octavia/api.pp | 2 | ||||
| -rw-r--r-- | manifests/profile/base/octavia/health_manager.pp | 2 | ||||
| -rw-r--r-- | manifests/profile/base/octavia/housekeeping.pp | 2 | ||||
| -rw-r--r-- | manifests/profile/base/octavia/worker.pp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/manifests/profile/base/octavia/api.pp b/manifests/profile/base/octavia/api.pp index d457478..2604711 100644 --- a/manifests/profile/base/octavia/api.pp +++ b/manifests/profile/base/octavia/api.pp @@ -29,7 +29,7 @@ # class tripleo::profile::base::octavia::api ( $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/octavia/health_manager.pp b/manifests/profile/base/octavia/health_manager.pp index bac5f65..8bb486a 100644 --- a/manifests/profile/base/octavia/health_manager.pp +++ b/manifests/profile/base/octavia/health_manager.pp @@ -24,7 +24,7 @@ # Defaults to hiera('step') # class tripleo::profile::base::octavia::health_manager ( - $step = hiera('step'), + $step = Integer(hiera('step')), ) { include ::tripleo::profile::base::octavia if $step >= 5 { diff --git a/manifests/profile/base/octavia/housekeeping.pp b/manifests/profile/base/octavia/housekeeping.pp index 0dcd5cf..d6f85ac 100644 --- a/manifests/profile/base/octavia/housekeeping.pp +++ b/manifests/profile/base/octavia/housekeeping.pp @@ -24,7 +24,7 @@ # Defaults to hiera('step') # class tripleo::profile::base::octavia::housekeeping ( - $step = hiera('step'), + $step = Integer(hiera('step')), ) { include ::tripleo::profile::base::octavia diff --git a/manifests/profile/base/octavia/worker.pp b/manifests/profile/base/octavia/worker.pp index 7df324d..ce49455 100644 --- a/manifests/profile/base/octavia/worker.pp +++ b/manifests/profile/base/octavia/worker.pp @@ -24,7 +24,7 @@ # Defaults to hiera('step') # class tripleo::profile::base::octavia::worker ( - $step = hiera('step'), + $step = Integer(hiera('step')), ) { include ::tripleo::profile::base::octavia |