From 94f13e66089cc0b18d5b4b2f6e204160d836ac3e Mon Sep 17 00:00:00 2001
From: Steve Baker <sbaker@redhat.com>
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/profile/base/neutron/agents/bagpipe.pp   | 2 +-
 manifests/profile/base/neutron/agents/bigswitch.pp | 2 +-
 manifests/profile/base/neutron/agents/l2gw.pp      | 2 +-
 manifests/profile/base/neutron/agents/midonet.pp   | 2 +-
 manifests/profile/base/neutron/agents/nuage.pp     | 2 +-
 manifests/profile/base/neutron/agents/ovn.pp       | 2 +-
 manifests/profile/base/neutron/agents/vpp.pp       | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'manifests/profile/base/neutron/agents')

diff --git a/manifests/profile/base/neutron/agents/bagpipe.pp b/manifests/profile/base/neutron/agents/bagpipe.pp
index fb5e000..de5bc17 100644
--- a/manifests/profile/base/neutron/agents/bagpipe.pp
+++ b/manifests/profile/base/neutron/agents/bagpipe.pp
@@ -27,7 +27,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::neutron::agents::bagpipe (
-  $step           = hiera('step'),
+  $step           = Integer(hiera('step')),
 ) {
   include ::tripleo::profile::base::neutron
 
diff --git a/manifests/profile/base/neutron/agents/bigswitch.pp b/manifests/profile/base/neutron/agents/bigswitch.pp
index 137dec0..e79c8a2 100644
--- a/manifests/profile/base/neutron/agents/bigswitch.pp
+++ b/manifests/profile/base/neutron/agents/bigswitch.pp
@@ -23,7 +23,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::neutron::agents::bigswitch(
-  $step = hiera('step'),
+  $step = Integer(hiera('step')),
 ) {
   if $step >= 4 {
     include ::neutron::agents::bigswitch
diff --git a/manifests/profile/base/neutron/agents/l2gw.pp b/manifests/profile/base/neutron/agents/l2gw.pp
index 10cd662..a728fa3 100644
--- a/manifests/profile/base/neutron/agents/l2gw.pp
+++ b/manifests/profile/base/neutron/agents/l2gw.pp
@@ -27,7 +27,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::neutron::agents::l2gw (
-  $step = hiera('step'),
+  $step = Integer(hiera('step')),
 ) {
   if $step >= 4 {
     include ::neutron::agents::l2gw
diff --git a/manifests/profile/base/neutron/agents/midonet.pp b/manifests/profile/base/neutron/agents/midonet.pp
index f2ce94a..c967589 100644
--- a/manifests/profile/base/neutron/agents/midonet.pp
+++ b/manifests/profile/base/neutron/agents/midonet.pp
@@ -33,7 +33,7 @@
 class tripleo::profile::base::neutron::agents::midonet (
   $midonet_libvirt_qemu_data = hiera('midonet_libvirt_qemu_data', ''),
   $neutron_api_node_ips      = hiera('neutron_api_node_ips', ''),
-  $step                      = hiera('step'),
+  $step                      = Integer(hiera('step')),
 ) {
   if $step >= 4 {
     # TODO(devvesa) provide non-controller ips for these services
diff --git a/manifests/profile/base/neutron/agents/nuage.pp b/manifests/profile/base/neutron/agents/nuage.pp
index 80beceb..2358a04 100644
--- a/manifests/profile/base/neutron/agents/nuage.pp
+++ b/manifests/profile/base/neutron/agents/nuage.pp
@@ -43,7 +43,7 @@ class tripleo::profile::base::neutron::agents::nuage (
   $nova_metadata_ip    = hiera('nova_metadata_node_ips', ''),
   $nova_os_password    = hiera('nova_password', ''),
   $nova_os_tenant_name = hiera('nova::api::admin_tenant_name', ''),
-  $step                = hiera('step'),
+  $step                = Integer(hiera('step')),
 ) {
   if $step >= 4 {
     include ::nuage::vrs
diff --git a/manifests/profile/base/neutron/agents/ovn.pp b/manifests/profile/base/neutron/agents/ovn.pp
index a593092..9f37bbf 100644
--- a/manifests/profile/base/neutron/agents/ovn.pp
+++ b/manifests/profile/base/neutron/agents/ovn.pp
@@ -32,7 +32,7 @@
 class tripleo::profile::base::neutron::agents::ovn (
   $ovn_db_host    = hiera('ovn_dbs_vip'),
   $ovn_sbdb_port  = hiera('ovn::southbound::port'),
-  $step           = hiera('step')
+  $step           = Integer(hiera('step'))
 ) {
   if $step >= 4 {
     class { '::ovn::controller':
diff --git a/manifests/profile/base/neutron/agents/vpp.pp b/manifests/profile/base/neutron/agents/vpp.pp
index e961aa7..6c55b86 100644
--- a/manifests/profile/base/neutron/agents/vpp.pp
+++ b/manifests/profile/base/neutron/agents/vpp.pp
@@ -32,7 +32,7 @@
 #   Defaults to 2379
 #
 class tripleo::profile::base::neutron::agents::vpp(
-  $step      = hiera('step'),
+  $step      = Integer(hiera('step')),
   $etcd_host = hiera('etcd_vip'),
   $etcd_port = 2379,
 ) {
-- 
cgit 1.2.3-korg