aboutsummaryrefslogtreecommitdiffstats
path: root/manifests/profile/base/database/mysql
diff options
context:
space:
mode:
authorSteve Baker <sbaker@redhat.com>2017-05-22 10:40:14 +1200
committerSteve Baker <sbaker@redhat.com>2017-06-14 14:31:52 +1200
commit94f13e66089cc0b18d5b4b2f6e204160d836ac3e (patch)
tree2974f79a71d44705c1791b258afe9b3250667bb5 /manifests/profile/base/database/mysql
parent2561fa9560e80e6f6cf9c6c1f1424491cfb012d9 (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/database/mysql')
-rw-r--r--manifests/profile/base/database/mysql/client.pp2
1 files changed, 1 insertions, 1 deletions
diff --git a/manifests/profile/base/database/mysql/client.pp b/manifests/profile/base/database/mysql/client.pp
index 3de1e97..1e55f05 100644
--- a/manifests/profile/base/database/mysql/client.pp
+++ b/manifests/profile/base/database/mysql/client.pp
@@ -50,7 +50,7 @@ class tripleo::profile::base::database::mysql::client (
$mysql_read_default_group = 'tripleo',
$mysql_client_bind_address = undef,
$ssl_ca = '/etc/pki/ca-trust/extracted/openssl/ca-bundle.trust.crt',
- $step = hiera('step'),
+ $step = Integer(hiera('step')),
) {
if $step >= 1 {
# If the folder /etc/my.cnf.d does not exist (e.g. if mariadb is not