From cf5fd01b0868eb678ab092d8104dd6db50d3a1c7 Mon Sep 17 00:00:00 2001 From: Emilien Macchi 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.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'puppet/manifests/overcloud_controller.pp') diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp index 69e48e95..30e7c8d9 100644 --- a/puppet/manifests/overcloud_controller.pp +++ b/puppet/manifests/overcloud_controller.pp @@ -17,8 +17,8 @@ include ::tripleo::packages include ::tripleo::firewall if hiera('step') >= 4 { - hiera_include('controller_classes') -} #END STEP 4 + hiera_include('controller_classes', []) +} $package_manifest_name = join(['/var/lib/tripleo/installed-packages/overcloud_controller', hiera('step')]) package_manifest{$package_manifest_name: ensure => present} -- cgit 1.2.3-korg