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
This commit is contained in:
parent
49a20369cb
commit
a84514f5b7
@ -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':
|
||||
|
@ -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')
|
||||
|
@ -0,0 +1,5 @@
|
||||
---
|
||||
upgrade:
|
||||
- |
|
||||
The ``horizon::enable_user_pass`` parameter has been removed. Use
|
||||
the ``horizon::dashboards::heat::enable_user_pass`` parameter instead.
|
@ -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({
|
||||
|
Loading…
Reference in New Issue
Block a user