From 8c1e96288bda54889a8c9ba1bd73df4cda978358 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Tue, 24 Dec 2019 17:42:53 -0500 Subject: [PATCH] Add keystone_resources_managed option to the cinder api class Add the keystone_resources_managed toggle so we can let Ansible controlling that resource and not Puppet. It's part of the efforts to not rely on Puppet to create Cloud resources like keystone resources, cinder types, etc. Change-Id: I557d8f33c9c699aed14b3b6fc1d1c0407365cd08 (cherry picked from commit ac5c901609f22e3195134b0af8e5e5856cfb773f) --- manifests/profile/base/cinder/api.pp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/manifests/profile/base/cinder/api.pp b/manifests/profile/base/cinder/api.pp index cd991f593..0cf42de0b 100644 --- a/manifests/profile/base/cinder/api.pp +++ b/manifests/profile/base/cinder/api.pp @@ -58,6 +58,12 @@ # for more details. # 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 ( $bootstrap_node = hiera('cinder_api_short_bootstrap_node_name', undef), $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'), $default_volume_type = hiera('cinder::api::default_volume_type', ''), $step = Integer(hiera('step')), + $keystone_resources_managed = hiera('keystone_resources_managed', true), ) { if $::hostname == downcase($bootstrap_node) { $sync_db = true - $manage_type = true + $manage_type = $keystone_resources_managed } else { $sync_db = false $manage_type = false