diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-08-09 12:39:18 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-08-09 12:39:18 +0000 |
commit | 173ce97b0c404e0dd815b299080fbdc89b680bc9 (patch) | |
tree | d7e295c6b52523c828897c662c5c8b514fb3456e /puppet/manifests/overcloud_controller_pacemaker.pp | |
parent | 8794610ceea3ae9537c302be595361f3bdad642a (diff) | |
parent | cf5fd01b0868eb678ab092d8104dd6db50d3a1c7 (diff) |
Merge "Remove static hieradata"
Diffstat (limited to 'puppet/manifests/overcloud_controller_pacemaker.pp')
-rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index 0aec972d..a782207e 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -16,17 +16,9 @@ include ::tripleo::packages include ::tripleo::firewall -if $::hostname == downcase(hiera('bootstrap_nodeid')) { - $pacemaker_master = true - $sync_db = true -} else { - $pacemaker_master = false - $sync_db = false +if hiera('step') >= 4 { + hiera_include('controller_classes', []) } -if hiera('step') >= 4 or ( hiera('step') >= 3 and $sync_db ) { - hiera_include('controller_classes') -} #END STEP 4 - $package_manifest_name = join(['/var/lib/tripleo/installed-packages/overcloud_controller_pacemaker', hiera('step')]) package_manifest{$package_manifest_name: ensure => present} |