Merge "Deprecate management of glance-cache.conf"

lib/puppet/type/glance_cache_config.rb

@@ -3,7 +3,7 @@ Puppet::Type.newtype(:glance_cache_config) do
   ensurable
 
   newparam(:name, :namevar => true) do
-    desc 'Section/setting name to manage from glance-cache.conf'
+    desc 'Section/setting name to manage from glance-cache.conf (DEPRECATED)'
     newvalues(/\S+\/\S+/)
   end
 

manifests/cache/logging.pp

@@ -115,6 +115,8 @@ class glance::cache::logging (
 ) {
   include glance::deps
 
+  warning('The glance::cache::logging class has been deprecated.')
+
   oslo::log { 'glance_cache_config':
     debug                         => $debug,
     use_stderr                    => $use_stderr,

manifests/config.pp

@@ -23,30 +23,37 @@
 # [*api_paste_ini_config*]
 #   (optional) Allow configuration of glance-api-paste.ini configurations.
 #
-# [*cache_config*]
-#   (optional) Allow configuration of glance-cache.conf configurations.
-#
 # [*image_import_config*]
 #   (optional) Allow configuration of glance-image-import.conf configurations.
 #
 # [*rootwrap_config*]
 #   (optional) Allow configuration of rootwrap.conf configurations.
 #
+# DEPRECATED PARAMETERS
+#
+# [*cache_config*]
+#   (optional) Allow configuration of glance-cache.conf configurations.
+#
 #   NOTE: The configuration MUST NOT be already handled by this module
 #   or Puppet catalog compilation will fail with duplicate resources.
 #
 class glance::config (
   Hash $api_config           = {},
   Hash $api_paste_ini_config = {},
-  Hash $cache_config         = {},
   Hash $image_import_config  = {},
   Hash $rootwrap_config      = {},
+  # DEPRECATED PARAMETERS
+  Optional[Hash] $cache_config = undef,
 ) {
   include glance::deps
 
   create_resources('glance_api_config', $api_config)
   create_resources('glance_api_paste_ini', $api_paste_ini_config)
-  create_resources('glance_cache_config', $cache_config)
   create_resources('glance_image_import_config', $image_import_config)
   create_resources('glance_rootwrap_config', $rootwrap_config)
+
+  if $cache_config != undef {
+    warning('The cache_config parameter has been deprecated.')
+    create_resources('glance_cache_config', $cache_config)
+  }
 }

releasenotes/notes/deprecate-cache-config-b22d38c115d8e658.yaml

@@ -0,0 +1,9 @@
+---
+deprecations:
+  - |
+    The following implementations to manage ``glance-cache.conf`` file have
+    been deprecated and will be removed in a future release.
+
+    - The ``glance_cache_config`` resource type
+    - The ``glance::cache::logging`` class
+    - The ``glance::config::cache_config`` parameter