summaryrefslogtreecommitdiffstats
path: root/manifests/profile
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-06-10 12:35:52 +0000
committerGerrit Code Review <review@openstack.org>2016-06-10 12:35:52 +0000
commit72fb6727951af2cf5b16e686b3a36f5f3a7c71c7 (patch)
tree74e732fde0eea35f63801b92dc1cede5196528cb /manifests/profile
parentab2bb3fea83912a2aa8795b93d59a9ed6f9e37e0 (diff)
parent6554ebbeb5dd351fc7af71a3f0eb97eccaaaf5e4 (diff)
Merge "Make neutron server/ml2 profiles match t-h-t"
Diffstat (limited to 'manifests/profile')
-rw-r--r--manifests/profile/base/neutron/ml2.pp7
-rw-r--r--manifests/profile/base/neutron/server.pp15
-rw-r--r--manifests/profile/pacemaker/neutron/ml2.pp15
-rw-r--r--manifests/profile/pacemaker/neutron/server.pp22
4 files changed, 37 insertions, 22 deletions
diff --git a/manifests/profile/base/neutron/ml2.pp b/manifests/profile/base/neutron/ml2.pp
index 47b1b3c..d18638e 100644
--- a/manifests/profile/base/neutron/ml2.pp
+++ b/manifests/profile/base/neutron/ml2.pp
@@ -22,6 +22,10 @@
# (Optional) The mechanism drivers to use with the Ml2 plugin
# Defaults to hiera('neutron::plugins::ml2::mechanism_drivers')
#
+# [*sync_db*]
+# (Optional) Whether to run Neutron DB sync operations
+# Defaults to undef
+#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
@@ -29,10 +33,11 @@
#
class tripleo::profile::base::neutron::ml2 (
$mechanism_drivers = hiera('neutron::plugins::ml2::mechanism_drivers'),
+ $sync_db = true,
$step = hiera('step'),
) {
- if $step >= 4 {
+ if $step >= 4 or ( $step >= 3 and $sync_db ) {
include ::neutron::plugins::ml2
include ::tripleo::profile::base::neutron
diff --git a/manifests/profile/base/neutron/server.pp b/manifests/profile/base/neutron/server.pp
index 14af56e..320f83c 100644
--- a/manifests/profile/base/neutron/server.pp
+++ b/manifests/profile/base/neutron/server.pp
@@ -18,31 +18,24 @@
#
# === Parameters
#
-# [*sync_db*]
-# (Optional) Whether to run Neutron DB sync operations
-# Defaults to undef
-#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
#
class tripleo::profile::base::neutron::server (
- $sync_db = true,
$step = hiera('step'),
) {
include ::tripleo::profile::base::neutron
- if $step >= 3 and $sync_db {
+ if $step >= 2 {
include ::neutron::db::mysql
}
- if $step >= 4 or ($step >=3 and $sync_db) {
+ if $step >= 4 {
include ::neutron::server::notifications
-
- class { '::neutron::server':
- sync_db => $sync_db,
- }
+ include ::neutron::server
}
+
}
diff --git a/manifests/profile/pacemaker/neutron/ml2.pp b/manifests/profile/pacemaker/neutron/ml2.pp
index 6c6e580..8acaf21 100644
--- a/manifests/profile/pacemaker/neutron/ml2.pp
+++ b/manifests/profile/pacemaker/neutron/ml2.pp
@@ -18,8 +18,19 @@
#
# === Parameters
#
-class tripleo::profile::pacemaker::neutron::ml2 {
+# [*pacemaker_master*]
+# (Optional) The hostname of the pacemaker master
+# Defaults to hiera('bootstrap_nodeid')
+#
+class tripleo::profile::pacemaker::neutron::ml2 (
+ $pacemaker_master = hiera('bootstrap_nodeid'),
+) {
+
include ::neutron::params
include ::tripleo::profile::pacemaker::neutron
- include ::tripleo::profile::base::neutron::ml2
+
+ class { '::tripleo::profile::base::neutron::ml2':
+ sync_db => ($::hostname == downcase($pacemaker_master))
+ }
+
}
diff --git a/manifests/profile/pacemaker/neutron/server.pp b/manifests/profile/pacemaker/neutron/server.pp
index f4fe083..fa00b3e 100644
--- a/manifests/profile/pacemaker/neutron/server.pp
+++ b/manifests/profile/pacemaker/neutron/server.pp
@@ -23,21 +23,27 @@
# Defaults to hiera('bootstrap_nodeid')
#
# [*step*]
-# (Optional) The current step in deployment. See tripleo-heat-templates
-# for more details.
-# Defaults to hiera('step')
+# (Optional) The current step in deployment. See tripleo-heat-templates
+# for more details.
+# Defaults to hiera('step')
#
class tripleo::profile::pacemaker::neutron::server (
$pacemaker_master = hiera('bootstrap_nodeid'),
- $step = hiera('step'),
+ $step = hiera('step'),
) {
+
include ::neutron::params
include ::tripleo::profile::pacemaker::neutron
- if $step >= 5 {
- class { '::tripleo::profile::base::neutron::server':
- sync_db => ($::hostname == downcase($pacemaker_master)),
- }
+ if $step >= 2 {
+ include ::neutron::db::mysql
+ Exec<| title == 'galera-ready'|> -> Class['neutron::db::mysql']
+ }
+
+ $sync_db = ($::hostname == downcase($pacemaker_master))
+ if $step >= 4 or ( $step >= 3 and $sync_db ) {
+ include ::neutron::server::notifications
+ include ::neutron::server
}
}