summaryrefslogtreecommitdiffstats
path: root/manifests/profile
diff options
context:
space:
mode:
authorMichael Chapman <woppin@gmail.com>2016-04-20 01:10:13 +1000
committerMichael Chapman <woppin@gmail.com>2016-04-20 01:10:13 +1000
commit7e0534d546756cba0a91d7751f5048b94bc5e0d8 (patch)
tree141601a70a0a00e126b4350ba03ed91423340170 /manifests/profile
parent33c6afe89ade18f3017158bddf60c1e51937583e (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')
-rw-r--r--manifests/profile/base/database/schemas.pp56
-rw-r--r--manifests/profile/pacemaker/database/schemas.pp7
2 files changed, 37 insertions, 26 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
+ }
}
-
}
diff --git a/manifests/profile/pacemaker/database/schemas.pp b/manifests/profile/pacemaker/database/schemas.pp
index 6aa5906..b301bab 100644
--- a/manifests/profile/pacemaker/database/schemas.pp
+++ b/manifests/profile/pacemaker/database/schemas.pp
@@ -18,6 +18,10 @@
#
# === Parameters
#
+# [*step*]
+# (Optional) The current deployment step
+# Defaults to hiera('step')
+#
# [*ceilometer_backend*]
# (Optional) The backend used by ceilometer, usually either 'mysql'
# or 'mongodb'
@@ -28,10 +32,11 @@
# Defaults to hiera('bootstrap_nodeid')
#
class tripleo::profile::pacemaker::database::schemas (
+ $step = hiera('step'),
$ceilometer_backend = hiera('ceilometer_backend'),
$pacemaker_master = hiera('bootstrap_nodeid')
) {
- if downcase($pacemaker_master) == $::hostname {
+ if downcase($pacemaker_master) == $::hostname and $step >= 2 {
include ::tripleo::profile::base::database::schemas
if downcase($ceilometer_backend) == 'mysql' {