From 476ee9b1a1de80101c29b09ea4ddff916e2f721e Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Sat, 2 Jul 2016 14:37:27 -0400 Subject: Set bootstrap_nodeid to undef by default bootstrap_nodeid is a parameter looked-up with Hiera but only set on controllers. With the transition to composable roles, we don't need to set this parameter on compute nodes, so let's just default this value by undef so we can deploy Neutron classes on compute nodes. Change-Id: I94034f696c163969a7489d9cb0a20423210d3b84 --- manifests/profile/pacemaker/neutron/server.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'manifests/profile/pacemaker/neutron/server.pp') 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'), ) { -- cgit 1.2.3-korg