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/pacemaker | |
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/pacemaker')
-rw-r--r-- | manifests/profile/pacemaker/neutron/ml2.pp | 15 | ||||
-rw-r--r-- | manifests/profile/pacemaker/neutron/server.pp | 22 |
2 files changed, 27 insertions, 10 deletions
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 } } |