From 91629ff680213c1f7adfd5496b9f9efea3c987b1 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Thu, 24 Dec 2020 10:21:52 +0900
Subject: [PATCH] Remove parameters to manage keystone resources and volume
 type

These parameters are always set to False since we implemented
management of keystone resources and default volume type in tht.

Change-Id: Ib53c6c10ba737b0504f30e7260cace6d18c2f033
---
 manifests/profile/base/cinder/api.pp               | 14 --------------
 manifests/profile/base/keystone.pp                 | 14 --------------
 .../tripleo_profile_base_cinder_api_spec.rb        |  4 +---
 3 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/manifests/profile/base/cinder/api.pp b/manifests/profile/base/cinder/api.pp
index a38983e82..6cafa2c97 100644
--- a/manifests/profile/base/cinder/api.pp
+++ b/manifests/profile/base/cinder/api.pp
@@ -58,12 +58,6 @@
 #   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', {}),
@@ -72,14 +66,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 $bootstrap_node and $::hostname == downcase($bootstrap_node) {
     $sync_db = true
-    $manage_type = $keystone_resources_managed
   } else {
     $sync_db = false
-    $manage_type = false
   }
 
   include tripleo::profile::base::cinder
@@ -107,9 +98,4 @@ class tripleo::profile::base::cinder::api (
       ssl_key  => $tls_keyfile,
     }
   }
-
-  if $step == 4 and $manage_type and $default_volume_type != '' {
-    cinder::type { $default_volume_type : }
-  }
-
 }
diff --git a/manifests/profile/base/keystone.pp b/manifests/profile/base/keystone.pp
index 6be2abe48..98e31d3ac 100644
--- a/manifests/profile/base/keystone.pp
+++ b/manifests/profile/base/keystone.pp
@@ -142,10 +142,6 @@
 #   for more details.
 #   Defaults to hiera('step')
 #
-# [*keystone_enable_member*]
-#   (Optional) Whether _member_ role is managed or not (required for Horizon).
-#   Defaults to hiera('keystone_enable_member', false)
-#
 # [*keystone_federation_enabled*]
 #   (Optional) Enable federated identity support
 #   Defaults to hiera('keystone_federation_enabled', false)
@@ -162,14 +158,6 @@
 #   (Optional) Memcached port to use.
 #   Defaults to hiera('memcached_port', 11211)
 #
-# [*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: endpoints, roles, services, projects, users and their
-#   assignment.
-#   This parameter is deprecated and is being removed in U cycle.
-#   Defaults to hiera('keystone_resources_managed', undef)
-#
 class tripleo::profile::base::keystone (
   $admin_endpoint_network         = hiera('keystone_admin_api_network', undef),
   $bootstrap_node                 = hiera('keystone_short_bootstrap_node_name', undef),
@@ -199,12 +187,10 @@ class tripleo::profile::base::keystone (
   $barbican_notification_topics   = [],
   $extra_notification_topics      = [],
   $step                           = Integer(hiera('step')),
-  $keystone_enable_member         = hiera('keystone_enable_member', false),
   $keystone_federation_enabled    = hiera('keystone_federation_enabled', false),
   $keystone_openidc_enabled       = hiera('keystone_openidc_enabled', false),
   $memcached_ips                  = hiera('memcached_node_ips', []),
   $memcached_port                 = hiera('memcached_port', 11211),
-  $keystone_resources_managed     = hiera('keystone_resources_managed', undef),
 ) {
   if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
     $sync_db = true
diff --git a/spec/classes/tripleo_profile_base_cinder_api_spec.rb b/spec/classes/tripleo_profile_base_cinder_api_spec.rb
index 25a77e1c1..71972e07b 100644
--- a/spec/classes/tripleo_profile_base_cinder_api_spec.rb
+++ b/spec/classes/tripleo_profile_base_cinder_api_spec.rb
@@ -87,7 +87,6 @@ describe 'tripleo::profile::base::cinder::api' do
           :keymgr_backend => 'castellan.key_manager.barbican_key_manager.BarbicanKeyManager',
         )
         is_expected.to contain_class('tripleo::profile::base::apache')
-        is_expected.to contain_cinder__type('tripleo')
       end
     end
 
@@ -97,7 +96,7 @@ describe 'tripleo::profile::base::cinder::api' do
         :bootstrap_node => 'other.example.com',
       } }
 
-      it 'should trigger complete configuration but with no db sync or default volume type' do
+      it 'should trigger complete configuration but with no db sync' do
         is_expected.to contain_class('tripleo::profile::base::cinder::api')
         is_expected.to contain_class('tripleo::profile::base::cinder')
         is_expected.to contain_class('tripleo::profile::base::cinder::authtoken')
@@ -106,7 +105,6 @@ describe 'tripleo::profile::base::cinder::api' do
           :keymgr_backend => 'castellan.key_manager.barbican_key_manager.BarbicanKeyManager',
         )
         is_expected.to contain_class('tripleo::profile::base::apache')
-        is_expected.to_not contain_cinder__type('tripleo')
       end
     end
   end