diff options
| -rw-r--r-- | manifests/profile/base/neutron/plugins/nuage.pp (renamed from manifests/profile/base/neutron/nuage.pp) | 14 | ||||
| -rw-r--r-- | manifests/profile/base/nova/api.pp | 8 | ||||
| -rw-r--r-- | manifests/profile/pacemaker/neutron/plugins/nuage.pp | 33 |
3 files changed, 50 insertions, 5 deletions
diff --git a/manifests/profile/base/neutron/nuage.pp b/manifests/profile/base/neutron/plugins/nuage.pp index 62e6c4f..20f93db 100644 --- a/manifests/profile/base/neutron/nuage.pp +++ b/manifests/profile/base/neutron/plugins/nuage.pp @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. # -# == Class: tripleo::profile::base::neutron:nuage: +# == Class: tripleo::profile::base::neutron::plugins::nuage # # Nuage Neutron profile for tripleo # @@ -21,11 +21,15 @@ # for more details. # Defaults to hiera('step') # -class tripleo::profile::base::neutron::nuage ( - $step = hiera('step'), +# [*sync_db*] +# (Optional) Whether to run Neutron DB sync operations +# Defaults to undef +# +class tripleo::profile::base::neutron::plugins::nuage ( + $step = hiera('step'), + $sync_db = true, ) { - include ::tripleo::profile::base::neutron::server - if $step >= 4 { + if $step >= 4 or ( $step >= 3 and $sync_db ) { include ::neutron::plugins::nuage } } diff --git a/manifests/profile/base/nova/api.pp b/manifests/profile/base/nova/api.pp index cb8d3f2..4064b1e 100644 --- a/manifests/profile/base/nova/api.pp +++ b/manifests/profile/base/nova/api.pp @@ -33,11 +33,19 @@ class tripleo::profile::base::nova::api ( ) { include ::tripleo::profile::base::nova + + if $step >= 2 and $sync_db { + include ::nova::db::mysql + include ::nova::db::mysql_api + Exec<| title == 'galera-ready'|> -> Anchor['nova::db::begin'] + } + if $step >= 4 or ($step >= 3 and $sync_db) { class { '::nova::api': sync_db => $sync_db, sync_db_api => $sync_db, } + include ::nova::network::neutron } } diff --git a/manifests/profile/pacemaker/neutron/plugins/nuage.pp b/manifests/profile/pacemaker/neutron/plugins/nuage.pp new file mode 100644 index 0000000..6b38884 --- /dev/null +++ b/manifests/profile/pacemaker/neutron/plugins/nuage.pp @@ -0,0 +1,33 @@ +# Copyright 2016 Red Hat, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# +# == Class: tripleo::profile::pacemaker::neutron::plugins::nuage +# +# Nuage Neutron profile for tripleo pacemaker +# +# === Parameters +# +# [*pacemaker_master*] +# (Optional) The hostname of the pacemaker master +# Defaults to hiera('bootstrap_nodeid') +# +class tripleo::profile::pacemaker::neutron::plugins::nuage ( + $pacemaker_master = hiera('bootstrap_nodeid'), +) { + + class { '::tripleo::profile::base::neutron::plugins::nuage': + sync_db => ($::hostname == downcase($pacemaker_master)) + } + +} |