From 94f13e66089cc0b18d5b4b2f6e204160d836ac3e Mon Sep 17 00:00:00 2001 From: Steve Baker Date: Mon, 22 May 2017 10:40:14 +1200 Subject: 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 --- manifests/network/contrail/config.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'manifests/network/contrail/config.pp') 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'), -- cgit 1.2.3-korg