diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-08-09 18:12:12 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-08-09 18:12:12 +0000 |
| commit | 9968f0b954fcc1a25582c76c80f9440ed65dec85 (patch) | |
| tree | 58640bd77641ced18e0a2ceb4b8a4927abd25b7d /manifests/profile/base/sahara | |
| parent | 20e1a821852d34f9c3201362cd619e41269ddbfd (diff) | |
| parent | c99c7862da980119fc9a51d18ab492bc03f00684 (diff) | |
Merge "Only db-sync sahara is included in the bootstrapnode"
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 df6c4c9..1ead106 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 db5ec51..4dbaa85 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 } } |