openstack
/
puppet-tripleo
Code Issues Proposed changes

Merge "Add keystone_resources_managed option to the cinder api class" into stable/train

This commit is contained in:
Zuul 2020-02-12 06:36:54 +00:00 committed by Gerrit Code Review
parent e4f7a86da4 8c1e96288b
commit 37aead2cf4
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
manifests/profile/base/cinder/api.pp
View File

@ -58,6 +58,12 @@
# for more details. # for more details.
# Defaults to hiera('step') # Defaults to hiera('step')
# #
# [*keystone_resources_managed*]
# (Optional) Enable the management of Keystone resources with Puppet.
# Can be disabled if Ansible manages these resources instead of Puppet.
# The resources are cinder types.
# Defaults to hiera('keystone_resources_managed', true)
#
class tripleo::profile::base::cinder::api ( class tripleo::profile::base::cinder::api (
$bootstrap_node = hiera('cinder_api_short_bootstrap_node_name', undef), $bootstrap_node = hiera('cinder_api_short_bootstrap_node_name', undef),
$certificates_specs = hiera('apache_certificates_specs', {}), $certificates_specs = hiera('apache_certificates_specs', {}),
@ -66,10 +72,11 @@ class tripleo::profile::base::cinder::api (
$keymgr_backend = hiera('cinder::api::keymgr_backend', 'cinder.keymgr.conf_key_mgr.ConfKeyManager'), $keymgr_backend = hiera('cinder::api::keymgr_backend', 'cinder.keymgr.conf_key_mgr.ConfKeyManager'),
$default_volume_type = hiera('cinder::api::default_volume_type', ''), $default_volume_type = hiera('cinder::api::default_volume_type', ''),
$step = Integer(hiera('step')), $step = Integer(hiera('step')),
$keystone_resources_managed = hiera('keystone_resources_managed', true),
) { ) {
if $::hostname == downcase($bootstrap_node) { if $::hostname == downcase($bootstrap_node) {
$sync_db = true $sync_db = true
$manage_type = true $manage_type = $keystone_resources_managed
} else { } else {
$sync_db = false $sync_db = false
$manage_type = false $manage_type = false