diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-06-10 14:32:32 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-06-10 14:32:32 +0000 |
| commit | 3ea42597cbe5136580955c5e13961f8b1d553d68 (patch) | |
| tree | 43b4b2f2b8c786d5ea996648935a0ce231e91b52 /manifests/profile/base/nova/conductor.pp | |
| parent | 72fb6727951af2cf5b16e686b3a36f5f3a7c71c7 (diff) | |
| parent | b1080692cd70326153b9492877a88a51a9b42c57 (diff) | |
Merge "Import ::nova class from THT"
Diffstat (limited to 'manifests/profile/base/nova/conductor.pp')
| -rw-r--r-- | manifests/profile/base/nova/conductor.pp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/manifests/profile/base/nova/conductor.pp b/manifests/profile/base/nova/conductor.pp index 494bbc7..04c9d06 100644 --- a/manifests/profile/base/nova/conductor.pp +++ b/manifests/profile/base/nova/conductor.pp @@ -27,8 +27,8 @@ class tripleo::profile::base::nova::conductor ( $step = hiera('step'), ) { + include ::tripleo::profile::base::nova if $step >= 4 { - include ::tripleo::profile::base::nova include ::nova::conductor } |