diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-05-20 08:45:16 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-05-20 08:45:16 +0000 |
| commit | 6e61fe6f7f5bd0ad217b723b7b31e53c7a28c916 (patch) | |
| tree | d6a5aa7af8e6ef9f69f231f3d6c0dd305b3370dc /puppet/manifests | |
| parent | e4dfaf4ab8295fdcb844b70238aae21a109d5282 (diff) | |
| parent | 7b6c2a4a7d596df25f249e653086ffb9225d3a37 (diff) | |
Merge "Ensure sync_db is consumed by Keystone and Cinder classes"
Diffstat (limited to 'puppet/manifests')
| -rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index c66460d9..ea2d2108 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -377,7 +377,9 @@ MYSQL_HOST=localhost\n", if (hiera('step') >= 3 and $pacemaker_master) or hiera('step') >= 4 { - include ::keystone + class { '::keystone': + sync_db => $sync_db, + } #TODO: need a cleanup-keystone-tokens.sh solution here keystone_config { @@ -479,7 +481,9 @@ if (hiera('step') >= 3 and $pacemaker_master) or hiera('step') >= 4 { Service['neutron-server'] -> Service['neutron-metadata'] include ::cinder - include ::cinder::api + class { '::cinder::api': + sync_db => $sync_db, + } include ::cinder::glance include ::cinder::scheduler include ::cinder::volume |