diff options
author | Dan Prince <dprince@redhat.com> | 2016-06-06 15:48:29 -0400 |
---|---|---|
committer | Dan Prince <dprince@redhat.com> | 2016-06-09 10:43:31 -0400 |
commit | 6554ebbeb5dd351fc7af71a3f0eb97eccaaaf5e4 (patch) | |
tree | 6b80bcda76c79c3b02fd78055c9af0fd7f4caea2 /manifests/profile/base/neutron/ml2.pp | |
parent | 806b9879c948462d381f8924616205e37e0e3785 (diff) |
Make neutron server/ml2 profiles match t-h-t
This patch brings the neutron profiles and the
associated steps in line with what already happens in
t-h-t. Specifically:
-we want to create the db $step >= 2 and $sync_db
-we want to make sure plugin.ini exists before the neutron dbsync
-we want to make sure the db sync runs before neutron::server starts
when using pacemaker
-split the neutron server profiles. They are quite different across
pacemaker and base.
Change-Id: I52815f45a04bf3e39940b9cb116261730580a3e2
Diffstat (limited to 'manifests/profile/base/neutron/ml2.pp')
-rw-r--r-- | manifests/profile/base/neutron/ml2.pp | 7 |
1 files changed, 6 insertions, 1 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 |