aboutsummaryrefslogtreecommitdiffstats
path: root/manifests/profile/base
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-08-04 12:29:25 +0000
committerGerrit Code Review <review@openstack.org>2016-08-04 12:29:25 +0000
commit96f3570ddc8f90d4c2867d7e40d7137456d706d0 (patch)
tree9696b12722fa2290ac0ce5f36554759a71f42a94 /manifests/profile/base
parent9c6630787b1607d727ba44e9b5847fb4fc9d2ca6 (diff)
parentfa4c306485338e7ed95fabbb5d9839cda59e93df (diff)
Merge "Fix Ironic dbsync ordering"
Diffstat (limited to 'manifests/profile/base')
-rw-r--r--manifests/profile/base/ironic.pp13
1 files changed, 7 insertions, 6 deletions
diff --git a/manifests/profile/base/ironic.pp b/manifests/profile/base/ironic.pp
index dd30dd7..ca4f366 100644
--- a/manifests/profile/base/ironic.pp
+++ b/manifests/profile/base/ironic.pp
@@ -30,19 +30,20 @@ class tripleo::profile::base::ironic (
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$step = hiera('step'),
) {
+ # Database is accessed by both API and conductor, hence it's here.
if $::hostname == downcase($bootstrap_node) {
$sync_db = true
} else {
$sync_db = false
}
- if $step >= 3 {
- include ::ironic
+ if $step >= 3 and $sync_db {
+ include ::ironic::db::mysql
+ }
- # Database is accessed by both API and conductor, hence it's here.
- if $sync_db {
- include ::ironic::db::mysql
- include ::ironic::db::sync
+ if $step >= 4 or ($step >= 3 and $sync_db) {
+ class { '::ironic':
+ sync_db => $sync_db,
}
}
}