diff options
| author |   Emilien Macchi <emilien@redhat.com> | 2016-07-02 14:37:27 -0400 |
|---|---|---|
| committer | Emilien Macchi <emilien@redhat.com> | 2016-07-02 14:37:27 -0400 |
| commit | 476ee9b1a1de80101c29b09ea4ddff916e2f721e (patch) | |
| tree | 1dd5bbc59e891d665fefc15403edd309f73d783b /manifests/profile/pacemaker/neutron/plugins | |
| parent | 389e7b42c0c1d9e81de928c6cc6763c294a9db6b (diff) | |
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
Diffstat (limited to 'manifests/profile/pacemaker/neutron/plugins')
4 files changed, 8 insertions, 8 deletions
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': |