From 4b8720e6c1aa1d8e5a5163aefaccf5b78f48896b Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Mon, 5 Dec 2016 02:32:30 +0100 Subject: Remove old ControllerConfig override from puppet-pacemaker.yaml Previously we had to override the location of the manifest file pushed on the controller nodes when deploying with Pacemaker, this is not needed anymore with composable roles. Change-Id: I1e010099263a325d06483f498c70582b008c31e2 --- puppet/manifests/overcloud_role.pp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'puppet/manifests/overcloud_role.pp') diff --git a/puppet/manifests/overcloud_role.pp b/puppet/manifests/overcloud_role.pp index 1a59620c..e2bf5146 100644 --- a/puppet/manifests/overcloud_role.pp +++ b/puppet/manifests/overcloud_role.pp @@ -24,3 +24,7 @@ if hiera('step') >= 4 { $package_manifest_name = join(['/var/lib/tripleo/installed-packages/overcloud___ROLE__', hiera('step')]) package_manifest{$package_manifest_name: ensure => present} + +# NOTE(gfidente): ensure deprecated package manifest is absent, can be removed after Pike +$absent_package_manifest_name = join(['/var/lib/tripleo/installed-packages/overcloud_controller_pacemaker', hiera('step')]) +package_manifest{$absent_package_manifest_name: ensure => absent} -- cgit 1.2.3-korg