diff options
| author |   Giulio Fidente <gfidente@redhat.com> | 2016-12-05 02:32:30 +0100 |
|---|---|---|
| committer | Giulio Fidente <gfidente@redhat.com> | 2017-01-03 19:45:43 +0100 |
| commit | 4b8720e6c1aa1d8e5a5163aefaccf5b78f48896b (patch) | |
| tree | 8952d1298a98576180bd353db3daae992705bfa0 /puppet/manifests/overcloud_role.pp | |
| parent | 7057ec6f7cedbf63ee0d0110cc14a61a9f2b07e1 (diff) | |
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
Diffstat (limited to 'puppet/manifests/overcloud_role.pp')
| -rw-r--r-- | puppet/manifests/overcloud_role.pp | 4 |
1 files changed, 4 insertions, 0 deletions
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} |