Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Composable firewall rules"
[apex-tripleo-heat-templates.git]
/
puppet
/
manifests
/
overcloud_controller.pp
diff --git
a/puppet/manifests/overcloud_controller.pp
b/puppet/manifests/overcloud_controller.pp
index
a635ef7
..
3778271
100644
(file)
--- a/
puppet/manifests/overcloud_controller.pp
+++ b/
puppet/manifests/overcloud_controller.pp
@@
-54,13
+54,5
@@
if hiera('step') >= 4 {
} #END STEP 4
} #END STEP 4
-if hiera('step') >= 5 {
- $nova_enable_db_purge = hiera('nova_enable_db_purge', true)
-
- if $nova_enable_db_purge {
- include ::nova::cron::archive_deleted_rows
- }
-} #END STEP 5
-
$package_manifest_name = join(['/var/lib/tripleo/installed-packages/overcloud_controller', hiera('step')])
package_manifest{$package_manifest_name: ensure => present}
$package_manifest_name = join(['/var/lib/tripleo/installed-packages/overcloud_controller', hiera('step')])
package_manifest{$package_manifest_name: ensure => present}