aboutsummaryrefslogtreecommitdiffstats
path: root/manifests/network
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/network
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/network')
-rw-r--r--manifests/network/contrail/analytics.pp2
-rw-r--r--manifests/network/contrail/analyticsdatabase.pp2
-rw-r--r--manifests/network/contrail/config.pp2
-rw-r--r--manifests/network/contrail/control.pp2
-rw-r--r--manifests/network/contrail/database.pp2
-rw-r--r--manifests/network/contrail/heat.pp2
-rw-r--r--manifests/network/contrail/provision.pp2
-rw-r--r--manifests/network/contrail/vrouter.pp2
8 files changed, 8 insertions, 8 deletions
diff --git a/manifests/network/contrail/analytics.pp b/manifests/network/contrail/analytics.pp
index e34c7e6..296fa19 100644
--- a/manifests/network/contrail/analytics.pp
+++ b/manifests/network/contrail/analytics.pp
@@ -189,7 +189,7 @@
# Defaults to hiera('contrail::zk_server_ip')
#
class tripleo::network::contrail::analytics(
- $step = hiera('step'),
+ $step = Integer(hiera('step')),
$admin_password = hiera('contrail::admin_password'),
$admin_tenant_name = hiera('contrail::admin_tenant_name'),
$admin_token = hiera('contrail::admin_token'),
diff --git a/manifests/network/contrail/analyticsdatabase.pp b/manifests/network/contrail/analyticsdatabase.pp
index 88b0327..cf3016a 100644
--- a/manifests/network/contrail/analyticsdatabase.pp
+++ b/manifests/network/contrail/analyticsdatabase.pp
@@ -120,7 +120,7 @@
# Defaults to hiera('contrail_database_node_ips')
#
class tripleo::network::contrail::analyticsdatabase(
- $step = hiera('step'),
+ $step = Integer(hiera('step')),
$auth_host = hiera('contrail::auth_host'),
$api_server = hiera('contrail_config_vip'),
$api_port = hiera('contrail::api_port'),
diff --git a/manifests/network/contrail/config.pp b/manifests/network/contrail/config.pp
index d02ab44..3fc4fd8 100644
--- a/manifests/network/contrail/config.pp
+++ b/manifests/network/contrail/config.pp
@@ -216,7 +216,7 @@
# Defaults to hiera('contrail_database_node_ips')
#
class tripleo::network::contrail::config(
- $step = hiera('step'),
+ $step = Integer(hiera('step')),
$aaa_mode = hiera('contrail::aaa_mode'),
$admin_password = hiera('contrail::admin_password'),
$admin_tenant_name = hiera('contrail::admin_tenant_name'),
diff --git a/manifests/network/contrail/control.pp b/manifests/network/contrail/control.pp
index e9c7a9e..530d607 100644
--- a/manifests/network/contrail/control.pp
+++ b/manifests/network/contrail/control.pp
@@ -117,7 +117,7 @@
# Defaults to hiera('step')
#
class tripleo::network::contrail::control(
- $step = hiera('step'),
+ $step = Integer(hiera('step')),
$admin_password = hiera('contrail::admin_password'),
$admin_tenant_name = hiera('contrail::admin_tenant_name'),
$admin_user = hiera('contrail::admin_user'),
diff --git a/manifests/network/contrail/database.pp b/manifests/network/contrail/database.pp
index f74eb1c..3d6b40b 100644
--- a/manifests/network/contrail/database.pp
+++ b/manifests/network/contrail/database.pp
@@ -117,7 +117,7 @@ class tripleo::network::contrail::database(
$host_ip = hiera('contrail::database::host_ip'),
$host_name = $::hostname,
$public_vip = hiera('public_virtual_ip'),
- $step = hiera('step'),
+ $step = Integer(hiera('step')),
$zookeeper_client_ip = hiera('contrail::database::host_ip'),
$zookeeper_hostnames = hiera('contrail_database_short_node_names'),
$zookeeper_server_ips = hiera('contrail_database_node_ips'),
diff --git a/manifests/network/contrail/heat.pp b/manifests/network/contrail/heat.pp
index 637fdda..4ef2a31 100644
--- a/manifests/network/contrail/heat.pp
+++ b/manifests/network/contrail/heat.pp
@@ -60,7 +60,7 @@ class tripleo::network::contrail::heat(
$api_port = 8082,
$api_server = hiera('contrail_config_vip'),
$auth_host = hiera('contrail::auth_host'),
- $step = hiera('step'),
+ $step = Integer(hiera('step')),
$use_ssl = 'False',
)
{
diff --git a/manifests/network/contrail/provision.pp b/manifests/network/contrail/provision.pp
index 3025737..742c4a2 100644
--- a/manifests/network/contrail/provision.pp
+++ b/manifests/network/contrail/provision.pp
@@ -71,7 +71,7 @@ class tripleo::network::contrail::provision(
$auth_host = hiera('contrail::auth_host'),
$auth_port = hiera('contrail::auth_port'),
$auth_protocol = hiera('contrail::auth_protocol'),
- $step = hiera('step'),
+ $step = Integer(hiera('step')),
)
{
if $step >= 5 {
diff --git a/manifests/network/contrail/vrouter.pp b/manifests/network/contrail/vrouter.pp
index 2bccd1d..678a77d 100644
--- a/manifests/network/contrail/vrouter.pp
+++ b/manifests/network/contrail/vrouter.pp
@@ -143,7 +143,7 @@
# Defaults to hiera('contrail::vrouter::is_tsn',false)
#
class tripleo::network::contrail::vrouter (
- $step = hiera('step'),
+ $step = Integer(hiera('step')),
$admin_password = hiera('contrail::admin_password'),
$admin_tenant_name = hiera('contrail::admin_tenant_name'),
$admin_token = hiera('contrail::admin_token'),