diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-06-30 12:53:18 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-06-30 12:53:18 +0000 |
| commit | 3747f6ddea935fe3682b1ee57c48fbf51caadacc (patch) | |
| tree | 115176226c70aa93d52e781ad4cac20a38a46535 | |
| parent | 21e14de71ba52208c29d43294b4b5e2d2099a7e1 (diff) | |
| parent | 0fc94f1266ea1b5aebb2a8eec1679135c23b97cd (diff) | |
Merge "Nova API and Neutron server should run database creation in step 3"
| -rw-r--r-- | manifests/profile/base/neutron/server.pp | 2 | ||||
| -rw-r--r-- | manifests/profile/base/nova/api.pp | 3 | ||||
| -rw-r--r-- | manifests/profile/pacemaker/neutron/server.pp | 3 |
3 files changed, 3 insertions, 5 deletions
diff --git a/manifests/profile/base/neutron/server.pp b/manifests/profile/base/neutron/server.pp index 320f83c..8b5539e 100644 --- a/manifests/profile/base/neutron/server.pp +++ b/manifests/profile/base/neutron/server.pp @@ -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 } diff --git a/manifests/profile/base/nova/api.pp b/manifests/profile/base/nova/api.pp index 4064b1e..3b36c57 100644 --- a/manifests/profile/base/nova/api.pp +++ b/manifests/profile/base/nova/api.pp @@ -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) { diff --git a/manifests/profile/pacemaker/neutron/server.pp b/manifests/profile/pacemaker/neutron/server.pp index 0bad1b9..13dfd9b 100644 --- a/manifests/profile/pacemaker/neutron/server.pp +++ b/manifests/profile/pacemaker/neutron/server.pp @@ -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 ) { |