aboutsummaryrefslogtreecommitdiffstats
path: root/manifests/profile/base/ceph
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/ceph
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/ceph')
-rw-r--r--manifests/profile/base/ceph/client.pp2
-rw-r--r--manifests/profile/base/ceph/mds.pp2
-rw-r--r--manifests/profile/base/ceph/mon.pp2
-rw-r--r--manifests/profile/base/ceph/osd.pp2
-rw-r--r--manifests/profile/base/ceph/rgw.pp2
5 files changed, 5 insertions, 5 deletions
diff --git a/manifests/profile/base/ceph/client.pp b/manifests/profile/base/ceph/client.pp
index 53f09c2..a38a6c5 100644
--- a/manifests/profile/base/ceph/client.pp
+++ b/manifests/profile/base/ceph/client.pp
@@ -24,7 +24,7 @@
# Defaults to hiera('step')
#
class tripleo::profile::base::ceph::client (
- $step = hiera('step'),
+ $step = Integer(hiera('step')),
) {
include ::tripleo::profile::base::ceph
diff --git a/manifests/profile/base/ceph/mds.pp b/manifests/profile/base/ceph/mds.pp
index c5c7654..9cc2b20 100644
--- a/manifests/profile/base/ceph/mds.pp
+++ b/manifests/profile/base/ceph/mds.pp
@@ -24,7 +24,7 @@
# Defaults to hiera('step')
#
class tripleo::profile::base::ceph::mds (
- $step = hiera('step'),
+ $step = Integer(hiera('step')),
) {
include ::tripleo::profile::base::ceph
diff --git a/manifests/profile/base/ceph/mon.pp b/manifests/profile/base/ceph/mon.pp
index c0768b6..21c69e7 100644
--- a/manifests/profile/base/ceph/mon.pp
+++ b/manifests/profile/base/ceph/mon.pp
@@ -35,7 +35,7 @@
#
class tripleo::profile::base::ceph::mon (
$ceph_pools = {},
- $step = hiera('step'),
+ $step = Integer(hiera('step')),
) {
include ::tripleo::profile::base::ceph
diff --git a/manifests/profile/base/ceph/osd.pp b/manifests/profile/base/ceph/osd.pp
index 6940bca..8b3d3c2 100644
--- a/manifests/profile/base/ceph/osd.pp
+++ b/manifests/profile/base/ceph/osd.pp
@@ -29,7 +29,7 @@
#
class tripleo::profile::base::ceph::osd (
$ceph_osd_selinux_permissive = false,
- $step = hiera('step'),
+ $step = Integer(hiera('step')),
) {
include ::tripleo::profile::base::ceph
diff --git a/manifests/profile/base/ceph/rgw.pp b/manifests/profile/base/ceph/rgw.pp
index d00f7cd..8a81efa 100644
--- a/manifests/profile/base/ceph/rgw.pp
+++ b/manifests/profile/base/ceph/rgw.pp
@@ -51,7 +51,7 @@ class tripleo::profile::base::ceph::rgw (
$civetweb_bind_ip = '127.0.0.1',
$civetweb_bind_port = '8080',
$rgw_keystone_version = 'v2.0',
- $step = hiera('step'),
+ $step = Integer(hiera('step')),
) {
include ::tripleo::profile::base::ceph