diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-09-06 15:04:07 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-09-06 15:04:07 +0000 |
| commit | 17f4a4f8e4d80eac4034bc44483d07945724b295 (patch) | |
| tree | 6545686e8e187cb64d3e5a73b85f57ddf8e4b5e6 | |
| parent | 5dae92678dedbed57ad600fcd96f17121b0a470e (diff) | |
| parent | 593503e351314e681558142399495be082e8117c (diff) | |
Merge "Include heat base profile outside of step"
| -rw-r--r-- | manifests/profile/base/heat/api.pp | 3 | ||||
| -rw-r--r-- | manifests/profile/base/heat/api_cfn.pp | 3 | ||||
| -rw-r--r-- | manifests/profile/base/heat/api_cloudwatch.pp | 3 | ||||
| -rw-r--r-- | manifests/profile/base/heat/engine.pp | 3 |
4 files changed, 8 insertions, 4 deletions
diff --git a/manifests/profile/base/heat/api.pp b/manifests/profile/base/heat/api.pp index 68de12b..7166298 100644 --- a/manifests/profile/base/heat/api.pp +++ b/manifests/profile/base/heat/api.pp @@ -26,8 +26,9 @@ class tripleo::profile::base::heat::api ( $step = hiera('step'), ) { + include ::tripleo::profile::base::heat + if $step >= 4 { - include ::tripleo::profile::base::heat include ::heat::api } } diff --git a/manifests/profile/base/heat/api_cfn.pp b/manifests/profile/base/heat/api_cfn.pp index 7c80fc6..c1adae6 100644 --- a/manifests/profile/base/heat/api_cfn.pp +++ b/manifests/profile/base/heat/api_cfn.pp @@ -26,8 +26,9 @@ class tripleo::profile::base::heat::api_cfn ( $step = hiera('step'), ) { + include ::tripleo::profile::base::heat + if $step >= 4 { - include ::tripleo::profile::base::heat include ::heat::api_cfn } } diff --git a/manifests/profile/base/heat/api_cloudwatch.pp b/manifests/profile/base/heat/api_cloudwatch.pp index 6362275..3004db9 100644 --- a/manifests/profile/base/heat/api_cloudwatch.pp +++ b/manifests/profile/base/heat/api_cloudwatch.pp @@ -26,8 +26,9 @@ class tripleo::profile::base::heat::api_cloudwatch ( $step = hiera('step'), ) { + include ::tripleo::profile::base::heat + if $step >= 4 { - include ::tripleo::profile::base::heat include ::heat::api_cloudwatch } } diff --git a/manifests/profile/base/heat/engine.pp b/manifests/profile/base/heat/engine.pp index 32a711f..112fad8 100644 --- a/manifests/profile/base/heat/engine.pp +++ b/manifests/profile/base/heat/engine.pp @@ -37,12 +37,13 @@ class tripleo::profile::base::heat::engine ( $sync_db = false } + include ::tripleo::profile::base::heat + if $step >= 3 and $sync_db { include ::heat::db::mysql } if $step >= 4 or ( $step >= 3 and $sync_db ) { - include ::tripleo::profile::base::heat include ::heat::engine } |