aboutsummaryrefslogtreecommitdiffstats
path: root/manifests/profile/base/neutron/server.pp
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-07-20 13:13:56 +0000
committerGerrit Code Review <review@openstack.org>2016-07-20 13:13:56 +0000
commitdfa0db9c7f5ece0914be616f963bf871563e6a1c (patch)
tree11daeacdf256a25a41cb5aa49352719ba0cd4fcb /manifests/profile/base/neutron/server.pp
parente121f195c8e8e33650b5b8a6472191b3f6ea5d21 (diff)
parent5927148c4b5813180204c2983b5c95b69a2ad265 (diff)
Merge "Make ::tripleo::profile::base classes work with multiple nodes"
Diffstat (limited to 'manifests/profile/base/neutron/server.pp')
-rw-r--r--manifests/profile/base/neutron/server.pp32
1 files changed, 27 insertions, 5 deletions
diff --git a/manifests/profile/base/neutron/server.pp b/manifests/profile/base/neutron/server.pp
index 8b5539e..5a1b377 100644
--- a/manifests/profile/base/neutron/server.pp
+++ b/manifests/profile/base/neutron/server.pp
@@ -18,24 +18,46 @@
#
# === Parameters
#
+# [*bootstrap_node*]
+# (Optional) The hostname of the node responsible for bootstrapping tasks
+# Defaults to hiera('bootstrap_nodeid')
+#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
#
class tripleo::profile::base::neutron::server (
- $step = hiera('step'),
+ $bootstrap_node = hiera('bootstrap_nodeid', undef),
+ $step = hiera('step'),
) {
+ if $::hostname == downcase($bootstrap_node) {
+ $sync_db = true
+ } else {
+ $sync_db = false
+ }
include ::tripleo::profile::base::neutron
- if $step >= 3 {
+ if $step >= 3 and $sync_db {
include ::neutron::db::mysql
}
- if $step >= 4 {
+ # We start neutron-server on the bootstrap node first, because
+ # it will try to populate tables and we need to make sure this happens
+ # before it starts on other nodes
+ if $step >= 4 and $sync_db {
include ::neutron::server::notifications
- include ::neutron::server
+ # We need to override the hiera value neutron::server::sync_db which is set
+ # to true
+ class { '::neutron::server':
+ sync_db => $sync_db,
+ }
+ }
+ if $step >= 5 and !$sync_db {
+ include ::neutron::server::notifications
+ class { '::neutron::server':
+ sync_db => $sync_db,
+ }
}
-
}