diff options
| author |   Juan Antonio Osorio Robles <jaosorior@redhat.com> | 2016-08-09 10:27:15 +0300 |
|---|---|---|
| committer | Juan Antonio Osorio Robles <jaosorior@redhat.com> | 2016-08-09 16:42:06 +0300 |
| commit | c99c7862da980119fc9a51d18ab492bc03f00684 (patch) | |
| tree | fcb8555e1dbae47b247e88e2a4a94db0cd2703d5 /manifests/profile/base/sahara | |
| parent | ac6c502a69bef7f00633499e2d21b3ec756c21ae (diff) | |
Only db-sync sahara is included in the bootstrapnode
Currently, sahara's db-sync is run on every node. We should instead
run it if we're on the bootstrap node as race conditions may occur
and these will cause issues.
Change-Id: I5db281caae17402ff198cb4cd46304338d98c52e
Diffstat (limited to 'manifests/profile/base/sahara')
| -rw-r--r-- | manifests/profile/base/sahara/api.pp | 3 | ||||
| -rw-r--r-- | manifests/profile/base/sahara/engine.pp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/manifests/profile/base/sahara/api.pp b/manifests/profile/base/sahara/api.pp index dc23d64..27e0390 100644 --- a/manifests/profile/base/sahara/api.pp +++ b/manifests/profile/base/sahara/api.pp @@ -26,8 +26,9 @@ class tripleo::profile::base::sahara::api ( $step = hiera('step'), ) { + include ::tripleo::profile::base::sahara + if $step >= 4 { - include ::tripleo::profile::base::sahara include ::sahara::service::api } } diff --git a/manifests/profile/base/sahara/engine.pp b/manifests/profile/base/sahara/engine.pp index f792a96..2d41e75 100644 --- a/manifests/profile/base/sahara/engine.pp +++ b/manifests/profile/base/sahara/engine.pp @@ -37,12 +37,13 @@ class tripleo::profile::base::sahara::engine ( $sync_db = false } + include ::tripleo::profile::base::sahara + if $step >= 3 and $sync_db { include ::sahara::db::mysql } if $step >= 4 or ($step >= 3 and $sync_db) { - include ::tripleo::profile::base::sahara include ::sahara::service::engine } } |