Merge "Set bootstrap_nodeid to undef by default"

11 files changed, 22 insertions, 22 deletions

diff --git a/manifests/profile/pacemaker/neutron.pp b/manifests/profile/pacemaker/neutron.pp
index 2af53dc..fff731d 100644
--- a/manifests/profile/pacemaker/neutron.pp
+++ b/manifests/profile/pacemaker/neutron.pp
@@ -24,7 +24,7 @@
 #
 # [*pacemaker_master*]
 #   (Optional) The hostname of the pacemaker master
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('bootstrap_nodeid', undef)
 #
 # [*enable_l3*]
 #   (Optional) Whether to include the Neutron L3 agent pacemaker profile
@@ -44,7 +44,7 @@
 #
 class tripleo::profile::pacemaker::neutron (
   $step             = hiera('step'),
-  $pacemaker_master = hiera('bootstrap_nodeid'),
+  $pacemaker_master = hiera('bootstrap_nodeid', undef),
   # We can drop the hiera defaults once the neutron roles are decomposed
   $enable_l3        = hiera('neutron::enable_l3_agent', false),
   $enable_dhcp      = hiera('neutron::enable_dhcp_agent', false),
diff --git a/manifests/profile/pacemaker/neutron/dhcp.pp b/manifests/profile/pacemaker/neutron/dhcp.pp
index 1f3b178..d738f21 100644
--- a/manifests/profile/pacemaker/neutron/dhcp.pp
+++ b/manifests/profile/pacemaker/neutron/dhcp.pp
@@ -25,11 +25,11 @@
 #
 # [*pacemaker_master*]
 #   (Optional) The hostname of the pacemaker master
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('bootstrap_nodeid', undef)
 #
 class tripleo::profile::pacemaker::neutron::dhcp (
   $step             = hiera('step'),
-  $pacemaker_master = hiera('bootstrap_nodeid'),
+  $pacemaker_master = hiera('bootstrap_nodeid', undef),
 ) {
 
   include ::neutron::params
diff --git a/manifests/profile/pacemaker/neutron/l3.pp b/manifests/profile/pacemaker/neutron/l3.pp
index e1699cc..fec4af2 100644
--- a/manifests/profile/pacemaker/neutron/l3.pp
+++ b/manifests/profile/pacemaker/neutron/l3.pp
@@ -25,11 +25,11 @@
 #
 # [*pacemaker_master*]
 #   (Optional) The hostname of the pacemaker master
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('bootstrap_nodeid', undef)
 #
 class tripleo::profile::pacemaker::neutron::l3 (
   $step             = hiera('step'),
-  $pacemaker_master = hiera('bootstrap_nodeid'),
+  $pacemaker_master = hiera('bootstrap_nodeid', undef),
 ) {
 
   include ::neutron::params
diff --git a/manifests/profile/pacemaker/neutron/metadata.pp b/manifests/profile/pacemaker/neutron/metadata.pp
index e6bccb1..4fccea2 100644
--- a/manifests/profile/pacemaker/neutron/metadata.pp
+++ b/manifests/profile/pacemaker/neutron/metadata.pp
@@ -25,11 +25,11 @@
 #
 # [*pacemaker_master*]
 #   (Optional) The hostname of the pacemaker master
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('bootstrap_nodeid', undef)
 #
 class tripleo::profile::pacemaker::neutron::metadata (
   $step             = hiera('step'),
-  $pacemaker_master = hiera('bootstrap_nodeid'),
+  $pacemaker_master = hiera('bootstrap_nodeid', undef),
 ) {
 
   include ::neutron::params
diff --git a/manifests/profile/pacemaker/neutron/midonet.pp b/manifests/profile/pacemaker/neutron/midonet.pp
index a4ec831..9d380f0 100644
--- a/manifests/profile/pacemaker/neutron/midonet.pp
+++ b/manifests/profile/pacemaker/neutron/midonet.pp
@@ -25,11 +25,11 @@
 #
 # [*pacemaker_master*]
 #   (Optional) The hostname of the pacemaker master
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('bootstrap_nodeid', undef)
 #
 class tripleo::profile::pacemaker::neutron::midonet (
   $step             = hiera('step'),
-  $pacemaker_master = hiera('bootstrap_nodeid'),
+  $pacemaker_master = hiera('bootstrap_nodeid', undef),
 ) {
   include ::neutron::params
   include ::tripleo::profile::pacemaker::neutron
diff --git a/manifests/profile/pacemaker/neutron/ovs.pp b/manifests/profile/pacemaker/neutron/ovs.pp
index 34ff5d3..a330de1 100644
--- a/manifests/profile/pacemaker/neutron/ovs.pp
+++ b/manifests/profile/pacemaker/neutron/ovs.pp
@@ -25,11 +25,11 @@
 #
 # [*pacemaker_master*]
 #   (Optional) The hostname of the pacemaker master
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('bootstrap_nodeid', undef)
 #
 class tripleo::profile::pacemaker::neutron::ovs (
   $step             = hiera('step'),
-  $pacemaker_master = hiera('bootstrap_nodeid'),
+  $pacemaker_master = hiera('bootstrap_nodeid', undef),
 ) {
 
   include ::neutron::params
diff --git a/manifests/profile/pacemaker/neutron/plugins/ml2.pp b/manifests/profile/pacemaker/neutron/plugins/ml2.pp
index 5ec363b..6c9d8b1 100644
--- a/manifests/profile/pacemaker/neutron/plugins/ml2.pp
+++ b/manifests/profile/pacemaker/neutron/plugins/ml2.pp
@@ -20,10 +20,10 @@
 #
 # [*pacemaker_master*]
 #   (Optional) The hostname of the pacemaker master
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('bootstrap_nodeid', undef)
 #
 class tripleo::profile::pacemaker::neutron::plugins::ml2 (
-  $pacemaker_master = hiera('bootstrap_nodeid'),
+  $pacemaker_master = hiera('bootstrap_nodeid', undef),
 ) {
 
   include ::neutron::params
diff --git a/manifests/profile/pacemaker/neutron/plugins/nuage.pp b/manifests/profile/pacemaker/neutron/plugins/nuage.pp
index 6b38884..ea40d38 100644
--- a/manifests/profile/pacemaker/neutron/plugins/nuage.pp
+++ b/manifests/profile/pacemaker/neutron/plugins/nuage.pp
@@ -20,10 +20,10 @@
 #
 # [*pacemaker_master*]
 #   (Optional) The hostname of the pacemaker master
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('bootstrap_nodeid', undef)
 #
 class tripleo::profile::pacemaker::neutron::plugins::nuage (
-  $pacemaker_master = hiera('bootstrap_nodeid'),
+  $pacemaker_master = hiera('bootstrap_nodeid', undef),
 ) {
 
   class { '::tripleo::profile::base::neutron::plugins::nuage':
diff --git a/manifests/profile/pacemaker/neutron/plugins/opencontrail.pp b/manifests/profile/pacemaker/neutron/plugins/opencontrail.pp
index 32564f4..8db3cb2 100644
--- a/manifests/profile/pacemaker/neutron/plugins/opencontrail.pp
+++ b/manifests/profile/pacemaker/neutron/plugins/opencontrail.pp
@@ -20,10 +20,10 @@
 #
 # [*pacemaker_master*]
 #   (Optional) The hostname of the pacemaker master
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('bootstrap_nodeid', undef)
 #
 class tripleo::profile::pacemaker::neutron::plugins::opencontrail (
-  $pacemaker_master = hiera('bootstrap_nodeid'),
+  $pacemaker_master = hiera('bootstrap_nodeid', undef),
 ) {
 
   class { '::tripleo::profile::base::neutron::plugins::opencontrail':
diff --git a/manifests/profile/pacemaker/neutron/plugins/plumgrid.pp b/manifests/profile/pacemaker/neutron/plugins/plumgrid.pp
index 1f2b32a..57f9e31 100644
--- a/manifests/profile/pacemaker/neutron/plugins/plumgrid.pp
+++ b/manifests/profile/pacemaker/neutron/plugins/plumgrid.pp
@@ -20,10 +20,10 @@
 #
 # [*pacemaker_master*]
 #   (Optional) The hostname of the pacemaker master
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('bootstrap_nodeid', undef)
 #
 class tripleo::profile::pacemaker::neutron::plugins::plumgrid (
-  $pacemaker_master = hiera('bootstrap_nodeid'),
+  $pacemaker_master = hiera('bootstrap_nodeid', undef),
 ) {
 
   class { '::tripleo::profile::base::neutron::plugins::plumgrid':
diff --git a/manifests/profile/pacemaker/neutron/server.pp b/manifests/profile/pacemaker/neutron/server.pp
index 13dfd9b..acd7993 100644
--- a/manifests/profile/pacemaker/neutron/server.pp
+++ b/manifests/profile/pacemaker/neutron/server.pp
@@ -20,7 +20,7 @@
 #
 # [*pacemaker_master*]
 #   (Optional) The hostname of the pacemaker master
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('bootstrap_nodeid', undef)
 #
 # [*step*]
 #  (Optional) The current step in deployment. See tripleo-heat-templates
@@ -28,7 +28,7 @@
 #  Defaults to hiera('step')
 #
 class tripleo::profile::pacemaker::neutron::server (
-  $pacemaker_master = hiera('bootstrap_nodeid'),
+  $pacemaker_master = hiera('bootstrap_nodeid', undef),
   $step             = hiera('step'),
 ) {