diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-08-10 07:09:28 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-08-10 07:09:28 +0000 |
| commit | 855d4b5e5e2521ac8a7dda32c0ce9d43f002b5c9 (patch) | |
| tree | 16f1c7193681aa6d6d10b0ffa55d2d7d657b2034 /manifests/profile/base | |
| parent | 9968f0b954fcc1a25582c76c80f9440ed65dec85 (diff) | |
| parent | 21bb7e4ac1051d28bb83de522f3cc6f79c0445e2 (diff) | |
Merge "Fix mistral sync_db profile steps"
Diffstat (limited to 'manifests/profile/base')
| -rw-r--r-- | manifests/profile/base/mistral.pp | 2 | ||||
| -rw-r--r-- | manifests/profile/base/mistral/api.pp | 2 | ||||
| -rw-r--r-- | manifests/profile/base/mistral/engine.pp | 2 | ||||
| -rw-r--r-- | manifests/profile/base/mistral/executor.pp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/manifests/profile/base/mistral.pp b/manifests/profile/base/mistral.pp index febbae6..0c41193 100644 --- a/manifests/profile/base/mistral.pp +++ b/manifests/profile/base/mistral.pp @@ -41,7 +41,7 @@ class tripleo::profile::base::mistral ( include ::mistral::db::mysql } - if $step >= 4 and $sync_db { + if $step >= 4 or ($step >= 3 and $sync_db) { include ::mistral include ::mistral::config include ::mistral::client diff --git a/manifests/profile/base/mistral/api.pp b/manifests/profile/base/mistral/api.pp index aeff788..50708f1 100644 --- a/manifests/profile/base/mistral/api.pp +++ b/manifests/profile/base/mistral/api.pp @@ -39,7 +39,7 @@ class tripleo::profile::base::mistral::api ( include ::tripleo::profile::base::mistral - if $step >= 4 and $sync_db { + if $step >= 4 or ($step >= 3 and $sync_db) { include ::mistral::api } } diff --git a/manifests/profile/base/mistral/engine.pp b/manifests/profile/base/mistral/engine.pp index cf82237..b2d8864 100644 --- a/manifests/profile/base/mistral/engine.pp +++ b/manifests/profile/base/mistral/engine.pp @@ -39,7 +39,7 @@ class tripleo::profile::base::mistral::engine ( include ::tripleo::profile::base::mistral - if $step >= 4 and $sync_db { + if $step >= 4 or ($step >= 3 and $sync_db) { include ::mistral::engine } diff --git a/manifests/profile/base/mistral/executor.pp b/manifests/profile/base/mistral/executor.pp index dd8c642..8e3f2c9 100644 --- a/manifests/profile/base/mistral/executor.pp +++ b/manifests/profile/base/mistral/executor.pp @@ -39,7 +39,7 @@ class tripleo::profile::base::mistral::executor ( include ::tripleo::profile::base::mistral - if $step >= 4 and $sync_db { + if $step >= 4 or ($step >= 3 and $sync_db) { include ::mistral::executor } } |