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/swift | |
parent | bb7e1829f683ca1cac2034ce0b450c0f7ce483ed (diff) | |
parent | 94f13e66089cc0b18d5b4b2f6e204160d836ac3e (diff) |
Merge "Ensure hiera step value is an integer"
Diffstat (limited to 'manifests/profile/base/swift')
-rw-r--r-- | manifests/profile/base/swift/proxy.pp | 2 | ||||
-rw-r--r-- | manifests/profile/base/swift/ringbuilder.pp | 2 | ||||
-rw-r--r-- | manifests/profile/base/swift/storage.pp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/manifests/profile/base/swift/proxy.pp b/manifests/profile/base/swift/proxy.pp index 4e0e568..b047c36 100644 --- a/manifests/profile/base/swift/proxy.pp +++ b/manifests/profile/base/swift/proxy.pp @@ -107,7 +107,7 @@ class tripleo::profile::base::swift::proxy ( $enable_internal_tls = hiera('enable_internal_tls', false), $memcache_port = 11211, $memcache_servers = hiera('memcached_node_ips'), - $step = hiera('step'), + $step = Integer(hiera('step')), $swift_proxy_network = hiera('swift_proxy_network', undef), $tls_proxy_bind_ip = undef, $tls_proxy_fqdn = undef, diff --git a/manifests/profile/base/swift/ringbuilder.pp b/manifests/profile/base/swift/ringbuilder.pp index 67156d4..3ab3234 100644 --- a/manifests/profile/base/swift/ringbuilder.pp +++ b/manifests/profile/base/swift/ringbuilder.pp @@ -77,7 +77,7 @@ class tripleo::profile::base::swift::ringbuilder ( $replicas, $build_ring = true, $devices = undef, - $step = hiera('step'), + $step = Integer(hiera('step')), $swift_zones = '1', $raw_disk_prefix = 'r1z1-', $raw_disks = [], diff --git a/manifests/profile/base/swift/storage.pp b/manifests/profile/base/swift/storage.pp index 5018d77..3d0ba16 100644 --- a/manifests/profile/base/swift/storage.pp +++ b/manifests/profile/base/swift/storage.pp @@ -30,7 +30,7 @@ class tripleo::profile::base::swift::storage ( # Deprecated conditional to support ControllerEnableSwiftStorage parameter $enable_swift_storage = true, - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $step >= 4 { if $enable_swift_storage { |