diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-06-16 23:25:23 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-06-16 23:25:23 +0000 |
| commit | 8ca7a1e390ce50ac66a6861dae59bb44fbf0324a (patch) | |
| tree | 04380590acfa8f36ed5ec661adc4ddb8c74bec01 /manifests/profile/base/database | |
| parent | bb7e1829f683ca1cac2034ce0b450c0f7ce483ed (diff) | |
| parent | 94f13e66089cc0b18d5b4b2f6e204160d836ac3e (diff) | |
Merge "Ensure hiera step value is an integer"
Diffstat (limited to 'manifests/profile/base/database')
| -rw-r--r-- | manifests/profile/base/database/mongodb.pp | 2 | ||||
| -rw-r--r-- | manifests/profile/base/database/mysql.pp | 2 | ||||
| -rw-r--r-- | manifests/profile/base/database/mysql/client.pp | 2 | ||||
| -rw-r--r-- | manifests/profile/base/database/redis.pp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/manifests/profile/base/database/mongodb.pp b/manifests/profile/base/database/mongodb.pp index 4740d67..48bdd82 100644 --- a/manifests/profile/base/database/mongodb.pp +++ b/manifests/profile/base/database/mongodb.pp @@ -37,7 +37,7 @@ class tripleo::profile::base::database::mongodb ( $mongodb_replset, $bootstrap_node = downcase(hiera('bootstrap_nodeid')), - $step = hiera('step'), + $step = Integer(hiera('step')), $memory_limit = '20G', ) { if $step >= 2 { diff --git a/manifests/profile/base/database/mysql.pp b/manifests/profile/base/database/mysql.pp index 2dac028..8eb6079 100644 --- a/manifests/profile/base/database/mysql.pp +++ b/manifests/profile/base/database/mysql.pp @@ -80,7 +80,7 @@ class tripleo::profile::base::database::mysql ( $mysql_server_options = {}, $mysql_max_connections = hiera('mysql_max_connections', undef), $remove_default_accounts = true, - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $::hostname == downcase($bootstrap_node) { 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 diff --git a/manifests/profile/base/database/redis.pp b/manifests/profile/base/database/redis.pp index 3890244..e357359 100644 --- a/manifests/profile/base/database/redis.pp +++ b/manifests/profile/base/database/redis.pp @@ -34,7 +34,7 @@ class tripleo::profile::base::database::redis ( $bootstrap_nodeid = hiera('bootstrap_nodeid'), $redis_node_ips = hiera('redis_node_ips'), - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $step >= 2 { if downcase($bootstrap_nodeid) == $::hostname { |