From a84514f5b78c601d85c99a83f613d8eace8348cd Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Mon, 9 May 2022 10:26:16 +0900
Subject: [PATCH] Remove enable_user_pass from the base horizon class

... because the parameter was deprecated during Xena cycle in favor of
the separate classes for dashboard plugins.

Change-Id: I0105dca66abed6b4252df93d71c10d838dda1a7b
---
 manifests/dashboards/heat.pp                        |  2 --
 manifests/init.pp                                   | 13 -------------
 ...enable_user_pass-from-base-e6e72e9dd5d6b85d.yaml |  5 +++++
 templates/_1699_orchestration_settings.py.erb       |  2 +-
 4 files changed, 6 insertions(+), 16 deletions(-)
 create mode 100644 releasenotes/notes/remove-enable_user_pass-from-base-e6e72e9dd5d6b85d.yaml

diff --git a/manifests/dashboards/heat.pp b/manifests/dashboards/heat.pp
index a8595b03..5752b4e9 100644
--- a/manifests/dashboards/heat.pp
+++ b/manifests/dashboards/heat.pp
@@ -63,8 +63,6 @@ class horizon::dashboards::heat(
     $policy_file_real = $policy_file
   }
 
-  $enable_user_pass_real = pick($::horizon::enable_user_pass, $enable_user_pass)
-
   $config_file = "${::horizon::params::conf_d_dir}/_1699_orchestration_settings.py"
 
   package { 'heat-dashboard':
diff --git a/manifests/init.pp b/manifests/init.pp
index 3f80e5b7..7d5b9755 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -535,12 +535,6 @@
 #    (optional) Enable the use of the system scope token on per-service basis.
 #    Defaults to undef
 #
-# DEPRECATED PARAMETERS
-#
-#  [*enable_user_pass*]
-#    (optional) Enable the password field while launching a Heat stack.
-#    Defaults to undef
-#
 # === Examples
 #
 #  class { 'horizon':
@@ -651,17 +645,10 @@ class horizon(
   $horizon_upload_mode                 = undef,
   $default_boot_source                 = undef,
   $system_scope_services               = undef,
-  # DEPRECATED PARAMETERS
-  $enable_user_pass                    = undef,
 ) inherits horizon::params {
 
   include horizon::deps
 
-  if $enable_user_pass != undef {
-    warning('The enable_user_pass parameter is deprecated. Use the horizon::dashboards::heat class')
-    include horizon::dashboards::heat
-  }
-
   # TODO(tkajinam): Remove this logic after Yoga cycle.
   if $horizon_upload_mode != undef {
     $horizon_upload_mode_real = regsubst($horizon_upload_mode, "('|\")", '', 'G')
diff --git a/releasenotes/notes/remove-enable_user_pass-from-base-e6e72e9dd5d6b85d.yaml b/releasenotes/notes/remove-enable_user_pass-from-base-e6e72e9dd5d6b85d.yaml
new file mode 100644
index 00000000..73aa38a3
--- /dev/null
+++ b/releasenotes/notes/remove-enable_user_pass-from-base-e6e72e9dd5d6b85d.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    The ``horizon::enable_user_pass`` parameter has been removed. Use
+    the ``horizon::dashboards::heat::enable_user_pass`` parameter instead.
diff --git a/templates/_1699_orchestration_settings.py.erb b/templates/_1699_orchestration_settings.py.erb
index bccb2895..057aedb1 100644
--- a/templates/_1699_orchestration_settings.py.erb
+++ b/templates/_1699_orchestration_settings.py.erb
@@ -2,7 +2,7 @@ from django.conf import settings
 
 
 OPENSTACK_HEAT_STACK = {
-    'enable_user_pass': <%= @enable_user_pass_real.to_s.capitalize %>,
+    'enable_user_pass': <%= @enable_user_pass.to_s.capitalize %>,
 }
 
 settings.POLICY_FILES.update({