openstack/puppet-tripleo
Code Issues Proposed changes

Include heat base profile outside of step

Browse Source 
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
This commit is contained in:
Juan Antonio Osorio Robles 2016-08-09 08:47:28 +03:00
parent 6e9c1f50a3
commit 593503e351
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/profile/base/heat/api.pp
View File

@ -26,8 +26,9 @@
class tripleo::profile::base::heat::api ( class tripleo::profile::base::heat::api (
$step = hiera('step'), $step = hiera('step'),
) { ) {
include ::tripleo::profile::base::heat
if $step >= 4 { if $step >= 4 {
include ::tripleo::profile::base::heat
include ::heat::api include ::heat::api
} }
} }

3
manifests/profile/base/heat/api_cfn.pp
View File

@ -26,8 +26,9 @@
class tripleo::profile::base::heat::api_cfn ( class tripleo::profile::base::heat::api_cfn (
$step = hiera('step'), $step = hiera('step'),
) { ) {
include ::tripleo::profile::base::heat
if $step >= 4 { if $step >= 4 {
include ::tripleo::profile::base::heat
include ::heat::api_cfn include ::heat::api_cfn
} }
} }

3
manifests/profile/base/heat/api_cloudwatch.pp
View File

@ -26,8 +26,9 @@
class tripleo::profile::base::heat::api_cloudwatch ( class tripleo::profile::base::heat::api_cloudwatch (
$step = hiera('step'), $step = hiera('step'),
) { ) {
include ::tripleo::profile::base::heat
if $step >= 4 { if $step >= 4 {
include ::tripleo::profile::base::heat
include ::heat::api_cloudwatch include ::heat::api_cloudwatch
} }
} }

3
manifests/profile/base/heat/engine.pp
View File

@ -37,12 +37,13 @@ class tripleo::profile::base::heat::engine (
$sync_db = false $sync_db = false
} }
include ::tripleo::profile::base::heat
if $step >= 3 and $sync_db { if $step >= 3 and $sync_db {
include ::heat::db::mysql include ::heat::db::mysql
} }
if $step >= 4 or ( $step >= 3 and $sync_db ) { if $step >= 4 or ( $step >= 3 and $sync_db ) {
include ::tripleo::profile::base::heat
include ::heat::engine include ::heat::engine
} }