diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-01-17 11:11:51 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-01-17 11:11:51 +0000 |
| commit | 2e3ff0a6734bce712ab11f37a9dc2454f1420d76 (patch) | |
| tree | 64ec94420d305ceae125f97825ccd99e1eb66f9f /puppet/manifests/overcloud_role.pp | |
| parent | 7ec199d64e2eb23b084f32bb42a1e8802fbf9931 (diff) | |
| parent | 4b8720e6c1aa1d8e5a5163aefaccf5b78f48896b (diff) | |
Merge "Remove old ControllerConfig override from puppet-pacemaker.yaml"
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} |