diff options
author | 2016-04-20 01:10:13 +1000 | |
---|---|---|
committer | 2016-04-20 01:10:13 +1000 | |
commit | 7e0534d546756cba0a91d7751f5048b94bc5e0d8 (patch) | |
tree | 141601a70a0a00e126b4350ba03ed91423340170 /manifests/profile/base/database/schemas.pp | |
parent | 33c6afe89ade18f3017158bddf60c1e51937583e (diff) |
Add steps to database profiles
Database schema profiles were missing step information, causing
schemas to be created too early.
Change-Id: Ic381804ce5f1aa257ece75d2e079f4b02f446344
Diffstat (limited to 'manifests/profile/base/database/schemas.pp')
-rw-r--r-- | manifests/profile/base/database/schemas.pp | 56 |
1 files changed, 31 insertions, 25 deletions
diff --git a/manifests/profile/base/database/schemas.pp b/manifests/profile/base/database/schemas.pp index 0821ae8..93fb2bb 100644 --- a/manifests/profile/base/database/schemas.pp +++ b/manifests/profile/base/database/schemas.pp @@ -18,6 +18,10 @@ # # === Parameters # +# [*step*] +# (Optional) The current deployment step +# Defaults to hiera('step') +# # [*ceilometer_backend*] # (Optional) Name of the backend for ceilometer storage # Defaults to hiera('ceilometer_backend') @@ -55,6 +59,7 @@ # Defaults to true # class tripleo::profile::base::database::schemas ( + $step = hiera('step'), $ceilometer_backend = hiera('ceilometer_backend'), $enable_ceilometer = true, $enable_cinder = true, @@ -65,37 +70,38 @@ class tripleo::profile::base::database::schemas ( $enable_neutron = true, $enable_sahara = true ) { - if $enable_ceilometer and downcase($ceilometer_backend) == 'mysql' { - include ::ceilometer::db::mysql - } + if $step >= 2 { + if $enable_ceilometer and downcase($ceilometer_backend) == 'mysql' { + include ::ceilometer::db::mysql + } - if $enable_cinder { - include ::cinder::db::mysql - } + if $enable_cinder { + include ::cinder::db::mysql + } - if $enable_keystone { - include ::keystone::db::mysql - } + if $enable_keystone { + include ::keystone::db::mysql + } - if $enable_glance { - include ::glance::db::mysql - } + if $enable_glance { + include ::glance::db::mysql + } - if $enable_nova { - include ::nova::db::mysql - include ::nova::db::mysql_api - } + if $enable_nova { + include ::nova::db::mysql + include ::nova::db::mysql_api + } - if $enable_neutron { - include ::neutron::db::mysql - } + if $enable_neutron { + include ::neutron::db::mysql + } - if $enable_heat { - include ::heat::db::mysql - } + if $enable_heat { + include ::heat::db::mysql + } - if $enable_sahara { - include ::sahara::db::mysql + if $enable_sahara { + include ::sahara::db::mysql + } } - } |