From cf5fd01b0868eb678ab092d8104dd6db50d3a1c7 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Thu, 4 Aug 2016 16:10:40 -0400
Subject: Remove static hieradata

Static hieradata moved to composable services, we don't need the files
anymore. It also cleanup how we construct Hieradata configuration by
removing unused hiera files.

Change-Id: I19f85b6c1b734473cf908ddaca29ad966f9f5405
---
 puppet/manifests/overcloud_controller_pacemaker.pp | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'puppet/manifests/overcloud_controller_pacemaker.pp')

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}
-- 
cgit 1.2.3-korg