summaryrefslogtreecommitdiffstats
path: root/puppet/manifests/overcloud_controller.pp
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-03-29 16:03:05 +0000
committerGerrit Code Review <review@openstack.org>2016-03-29 16:03:05 +0000
commit7d704fbd074cdeb2b381aab353ee1deaeb9ae736 (patch)
tree625a666b1b4564691ee96fd2fa9e47fce8840cbd /puppet/manifests/overcloud_controller.pp
parent717d949ddfe128c84239418c5559464172ec236f (diff)
parent9988bd25aa4bac1375ef4783d636c7adecedee92 (diff)
Merge "Increment step count to include ringbuilder"
Diffstat (limited to 'puppet/manifests/overcloud_controller.pp')
-rw-r--r--puppet/manifests/overcloud_controller.pp8
1 files changed, 4 insertions, 4 deletions
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index 5b3e8f77..ff2264cf 100644
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -210,7 +210,7 @@ if hiera('step') >= 2 {
} #END STEP 2
-if hiera('step') >= 3 {
+if hiera('step') >= 4 {
include ::keystone
include ::keystone::config
@@ -673,9 +673,9 @@ if hiera('step') >= 3 {
hiera_include('controller_classes')
-} #END STEP 3
+} #END STEP 4
-if hiera('step') >= 4 {
+if hiera('step') >= 5 {
$keystone_enable_db_purge = hiera('keystone_enable_db_purge', true)
$nova_enable_db_purge = hiera('nova_enable_db_purge', true)
$cinder_enable_db_purge = hiera('cinder_enable_db_purge', true)
@@ -710,7 +710,7 @@ if hiera('step') >= 4 {
}
}
-} #END STEP 4
+} #END STEP 5
$package_manifest_name = join(['/var/lib/tripleo/installed-packages/overcloud_controller', hiera('step')])
package_manifest{$package_manifest_name: ensure => present}