diff options
author | 2016-02-12 13:19:44 +0000 | |
---|---|---|
committer | 2016-02-12 13:19:44 +0000 | |
commit | 8d763fc70c33695a4752b04656d3904561cc19f3 (patch) | |
tree | 9e350064ae64ddaeb898a678a9f084d83ca30bf5 /puppet/manifests | |
parent | 20fc1118fda24946ada541ebc435896253c2a911 (diff) | |
parent | 65353adb6f4dce73c9c7384bd9cbbea6b09f3e6c (diff) |
Merge "Nova now requires an api database to be created"
Diffstat (limited to 'puppet/manifests')
-rw-r--r-- | puppet/manifests/overcloud_controller.pp | 1 | ||||
-rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp index ae272335..276093ba 100644 --- a/puppet/manifests/overcloud_controller.pp +++ b/puppet/manifests/overcloud_controller.pp @@ -100,6 +100,7 @@ if hiera('step') >= 2 { include ::keystone::db::mysql include ::glance::db::mysql include ::nova::db::mysql + include ::nova::db::mysql_api include ::neutron::db::mysql include ::cinder::db::mysql include ::heat::db::mysql diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index a34d0709..8fbb25ab 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -429,6 +429,9 @@ MYSQL_HOST=localhost\n", class { '::nova::db::mysql': require => Exec['galera-ready'], } + class { '::nova::db::mysql_api': + require => Exec['galera-ready'], + } class { '::neutron::db::mysql': require => Exec['galera-ready'], } @@ -574,6 +577,7 @@ if hiera('step') >= 3 { class { '::nova::api' : sync_db => $sync_db, + sync_db_api => $sync_db, manage_service => false, enabled => false, } |