aboutsummaryrefslogtreecommitdiffstats
path: root/manifests
diff options
context:
space:
mode:
authorJuan Antonio Osorio Robles <jaosorior@redhat.com>2016-08-09 08:47:28 +0300
committerJuan Antonio Osorio Robles <jaosorior@redhat.com>2016-08-13 09:55:08 +0000
commit593503e351314e681558142399495be082e8117c (patch)
tree6b78641ee5157d642e30b13ef75bbe60d7ec4c9c /manifests
parent6e9c1f50a3b0c17854663a81d19a788e241257d6 (diff)
Include heat base profile outside of step
The base profile can already take the steps into account. so it's not necessary to include it inside the if statement. Change-Id: I7b22063db7ff4807242cc0e353dccc34be848b8d
Diffstat (limited to 'manifests')
-rw-r--r--manifests/profile/base/heat/api.pp3
-rw-r--r--manifests/profile/base/heat/api_cfn.pp3
-rw-r--r--manifests/profile/base/heat/api_cloudwatch.pp3
-rw-r--r--manifests/profile/base/heat/engine.pp3
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
}