aboutsummaryrefslogtreecommitdiffstats
path: root/manifests/profile/base/neutron/plugins
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/neutron/plugins
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/neutron/plugins')
-rw-r--r--manifests/profile/base/neutron/plugins/ml2.pp2
-rw-r--r--manifests/profile/base/neutron/plugins/ml2/bagpipe.pp2
-rw-r--r--manifests/profile/base/neutron/plugins/ml2/opendaylight.pp2
-rw-r--r--manifests/profile/base/neutron/plugins/ml2/ovn.pp2
-rw-r--r--manifests/profile/base/neutron/plugins/ml2/vpp.pp2
-rw-r--r--manifests/profile/base/neutron/plugins/nsx_v3.pp2
-rw-r--r--manifests/profile/base/neutron/plugins/nuage.pp2
-rw-r--r--manifests/profile/base/neutron/plugins/opencontrail.pp2
-rw-r--r--manifests/profile/base/neutron/plugins/ovs/opendaylight.pp2
-rw-r--r--manifests/profile/base/neutron/plugins/plumgrid.pp2
10 files changed, 10 insertions, 10 deletions
diff --git a/manifests/profile/base/neutron/plugins/ml2.pp b/manifests/profile/base/neutron/plugins/ml2.pp
index 1702fed..f7a2935 100644
--- a/manifests/profile/base/neutron/plugins/ml2.pp
+++ b/manifests/profile/base/neutron/plugins/ml2.pp
@@ -34,7 +34,7 @@
class tripleo::profile::base::neutron::plugins::ml2 (
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$mechanism_drivers = hiera('neutron::plugins::ml2::mechanism_drivers'),
- $step = hiera('step'),
+ $step = Integer(hiera('step')),
) {
if $::hostname == downcase($bootstrap_node) {
$sync_db = true
diff --git a/manifests/profile/base/neutron/plugins/ml2/bagpipe.pp b/manifests/profile/base/neutron/plugins/ml2/bagpipe.pp
index 161cd75..44521ef 100644
--- a/manifests/profile/base/neutron/plugins/ml2/bagpipe.pp
+++ b/manifests/profile/base/neutron/plugins/ml2/bagpipe.pp
@@ -27,7 +27,7 @@
# Defaults to hiera('step')
#
class tripleo::profile::base::neutron::plugins::ml2::bagpipe (
- $step = hiera('step'),
+ $step = Integer(hiera('step')),
) {
include ::tripleo::profile::base::neutron
diff --git a/manifests/profile/base/neutron/plugins/ml2/opendaylight.pp b/manifests/profile/base/neutron/plugins/ml2/opendaylight.pp
index 2618d4f..bffcb39 100644
--- a/manifests/profile/base/neutron/plugins/ml2/opendaylight.pp
+++ b/manifests/profile/base/neutron/plugins/ml2/opendaylight.pp
@@ -49,7 +49,7 @@ class tripleo::profile::base::neutron::plugins::ml2::opendaylight (
$odl_password = hiera('opendaylight::password'),
$odl_url_ip = hiera('opendaylight_api_vip'),
$conn_proto = hiera('opendaylight::nb_connection_protocol'),
- $step = hiera('step'),
+ $step = Integer(hiera('step')),
) {
if $step >= 4 {
diff --git a/manifests/profile/base/neutron/plugins/ml2/ovn.pp b/manifests/profile/base/neutron/plugins/ml2/ovn.pp
index b5b7a0a..fad907c 100644
--- a/manifests/profile/base/neutron/plugins/ml2/ovn.pp
+++ b/manifests/profile/base/neutron/plugins/ml2/ovn.pp
@@ -37,7 +37,7 @@ class tripleo::profile::base::neutron::plugins::ml2::ovn (
$ovn_db_host = hiera('ovn_dbs_vip'),
$ovn_nb_port = hiera('ovn::northbound::port'),
$ovn_sb_port = hiera('ovn::southbound::port'),
- $step = hiera('step')
+ $step = Integer(hiera('step'))
) {
if $step >= 4 {
class { '::neutron::plugins::ml2::ovn':
diff --git a/manifests/profile/base/neutron/plugins/ml2/vpp.pp b/manifests/profile/base/neutron/plugins/ml2/vpp.pp
index 217e4cf..7d59239 100644
--- a/manifests/profile/base/neutron/plugins/ml2/vpp.pp
+++ b/manifests/profile/base/neutron/plugins/ml2/vpp.pp
@@ -32,7 +32,7 @@
# Defaults to 2379
#
class tripleo::profile::base::neutron::plugins::ml2::vpp (
- $step = hiera('step'),
+ $step = Integer(hiera('step')),
$etcd_host = hiera('etcd_vip'),
$etcd_port = 2379,
) {
diff --git a/manifests/profile/base/neutron/plugins/nsx_v3.pp b/manifests/profile/base/neutron/plugins/nsx_v3.pp
index 33fa0cf..b534a2f 100644
--- a/manifests/profile/base/neutron/plugins/nsx_v3.pp
+++ b/manifests/profile/base/neutron/plugins/nsx_v3.pp
@@ -29,7 +29,7 @@
#
class tripleo::profile::base::neutron::plugins::nsx_v3 (
$bootstrap_node = hiera('bootstrap_nodeid', undef),
- $step = hiera('step'),
+ $step = Integer(hiera('step')),
) {
if $::hostname == downcase($bootstrap_node) {
$sync_db = true
diff --git a/manifests/profile/base/neutron/plugins/nuage.pp b/manifests/profile/base/neutron/plugins/nuage.pp
index 0843ec4..ccfcae1 100644
--- a/manifests/profile/base/neutron/plugins/nuage.pp
+++ b/manifests/profile/base/neutron/plugins/nuage.pp
@@ -27,7 +27,7 @@
#
class tripleo::profile::base::neutron::plugins::nuage (
$bootstrap_node = hiera('bootstrap_nodeid', undef),
- $step = hiera('step'),
+ $step = Integer(hiera('step')),
) {
if $::hostname == downcase($bootstrap_node) {
$sync_db = true
diff --git a/manifests/profile/base/neutron/plugins/opencontrail.pp b/manifests/profile/base/neutron/plugins/opencontrail.pp
index fbf46e7..d13af61 100644
--- a/manifests/profile/base/neutron/plugins/opencontrail.pp
+++ b/manifests/profile/base/neutron/plugins/opencontrail.pp
@@ -27,7 +27,7 @@
#
class tripleo::profile::base::neutron::plugins::opencontrail (
$bootstrap_node = hiera('bootstrap_nodeid', undef),
- $step = hiera('step'),
+ $step = Integer(hiera('step')),
) {
if $::hostname == downcase($bootstrap_node) {
$sync_db = true
diff --git a/manifests/profile/base/neutron/plugins/ovs/opendaylight.pp b/manifests/profile/base/neutron/plugins/ovs/opendaylight.pp
index 4da8df9..59060a6 100644
--- a/manifests/profile/base/neutron/plugins/ovs/opendaylight.pp
+++ b/manifests/profile/base/neutron/plugins/ovs/opendaylight.pp
@@ -49,7 +49,7 @@ class tripleo::profile::base::neutron::plugins::ovs::opendaylight (
$odl_api_ips = hiera('opendaylight_api_node_ips'),
$odl_url_ip = hiera('opendaylight_api_vip'),
$conn_proto = hiera('opendaylight::nb_connection_protocol'),
- $step = hiera('step'),
+ $step = Integer(hiera('step')),
) {
if $step >= 4 {
diff --git a/manifests/profile/base/neutron/plugins/plumgrid.pp b/manifests/profile/base/neutron/plugins/plumgrid.pp
index bc73d29..606f001 100644
--- a/manifests/profile/base/neutron/plugins/plumgrid.pp
+++ b/manifests/profile/base/neutron/plugins/plumgrid.pp
@@ -29,7 +29,7 @@
#
class tripleo::profile::base::neutron::plugins::plumgrid (
$bootstrap_node = hiera('bootstrap_nodeid', undef),
- $step = hiera('step'),
+ $step = Integer(hiera('step')),
) {
if $::hostname == downcase($bootstrap_node) {
$sync_db = true