openstack
/
puppet-tripleo
Code Issues Proposed changes

Merge "Nova API and Neutron server should run database creation in step 3"

This commit is contained in:
Jenkins 2016-06-30 12:53:18 +00:00 committed by Gerrit Code Review
parent 21e14de71b 0fc94f1266
commit 3747f6ddea
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/profile/base/neutron/server.pp
View File

@ -29,7 +29,7 @@ class tripleo::profile::base::neutron::server (
include ::tripleo::profile::base::neutron
if $step >= 2 {
if $step >= 3 {
include ::neutron::db::mysql
}

3
manifests/profile/base/nova/api.pp
View File

@ -34,10 +34,9 @@ class tripleo::profile::base::nova::api (
include ::tripleo::profile::base::nova
if $step >= 2 and $sync_db {
if $step >= 3 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) {

3
manifests/profile/pacemaker/neutron/server.pp
View File

@ -36,9 +36,8 @@ class tripleo::profile::pacemaker::neutron::server (
include ::tripleo::profile::pacemaker::neutron
$sync_db = ($::hostname == downcase($pacemaker_master))
if $step >= 2 and $sync_db {
if $step >= 3 and $sync_db {
include ::neutron::db::mysql
Exec<| title == 'galera-ready'|> -> Class['neutron::db::mysql']
}
if $step >= 4 or ( $step >= 3 and $sync_db ) {