Merge "Deprecate support for [DEFAULT] catalog_template_file"

manifests/init.pp

@@ -12,10 +12,6 @@
 #   (Optional) Catalog driver used by Keystone to store endpoints and services.
 #   Defaults to $facts['os_service_default'].
 #
-# [*catalog_template_file*]
-#   (Optional) Path to the catalog used if 'templated' catalog driver is used.
-#   Defaults to '/etc/keystone/default_catalog.templates'
-#
 # [*token_provider*]
 #   (Optional) Format keystone uses for tokens.
 #   Defaults to 'fernet'
@@ -346,6 +342,10 @@
 #   accepts latest or specific versions.
 #   Defaults to present.
 #
+# [*catalog_template_file*]
+#   (Optional) Path to the catalog used if 'templated' catalog driver is used.
+#   Defaults to '/etc/keystone/default_catalog.templates'
+#
 # == Authors
 #
 #   Dan Bode dan@puppetlabs.com
@@ -357,7 +357,6 @@
 class keystone(
   $package_ensure                                 = 'present',
   $catalog_driver                                 = $facts['os_service_default'],
-  $catalog_template_file                          = '/etc/keystone/default_catalog.templates',
   $token_provider                                 = 'fernet',
   $token_expiration                               = 3600,
   $password_hash_algorithm                        = $facts['os_service_default'],
@@ -417,6 +416,7 @@ class keystone(
   $amqp_durable_queues                            = $facts['os_service_default'],
   # DEPRECATED PARAMETERS
   $client_package_ensure                          = undef,
+  $catalog_template_file                          = undef,
 ) inherits keystone::params {
 
   include keystone::deps
@@ -427,6 +427,13 @@ class keystone(
     warning('The client_package_ensure parameter is deprecated and has no effect.')
   }
 
+  if $catalog_template_file != undef {
+    warning('The catalog_template_file parameter is deprecated and will be removed in a future release')
+    $catalog_template_file_real = $catalog_template_file
+  } else {
+    $catalog_template_file_real = '/etc/keystone/default_catalog.templates'
+  }
+
   if $manage_policyrcd {
     # openstacklib policy_rcd only affects debian based systems.
     if ($facts['os']['name'] == 'Ubuntu') {
@@ -483,7 +490,7 @@ class keystone(
 
   keystone_config {
     'catalog/driver':        value => $catalog_driver;
-    'catalog/template_file': value => $catalog_template_file;
+    'catalog/template_file': value => $catalog_template_file_real;
   }
 
   keystone_config {

releasenotes/notes/deprecate-catalog_template_file-5f8202e78af74aa3.yaml

@@ -0,0 +1,5 @@
+---
+deprecations:
+  - |
+    The ``keystone::catalog_template_file`` parameter has been deprecated and
+    will be removed in a futrue release.