Remove hard-code of default identity api version
Current default matches the default value in Horizon, thus hard-coding the default value is not necessary. Change-Id: I03ef1e6e894322acf0a5177c155b04196999db22
This commit is contained in:
parent
00ce4ba698
commit
6236f39018
@ -318,7 +318,7 @@
|
||||
# [*api_versions*]
|
||||
# (optional) A hash of parameters to set specific api versions.
|
||||
# Example: api_versions => {'identity' => 3}
|
||||
# Default to 'identity' => 3
|
||||
# Default to {}
|
||||
#
|
||||
# [*keystone_multidomain_support*]
|
||||
# (optional) Enables multi-domain in horizon. When this is enabled, it will require user to enter
|
||||
@ -608,7 +608,7 @@ class horizon(
|
||||
$policy_files_path = undef,
|
||||
$policy_files = undef,
|
||||
$redirect_type = 'permanent',
|
||||
$api_versions = {'identity' => '3'},
|
||||
$api_versions = {},
|
||||
$keystone_multidomain_support = false,
|
||||
$keystone_default_domain = undef,
|
||||
$keystone_domain_choices = undef,
|
||||
|
@ -60,7 +60,6 @@ describe 'horizon' do
|
||||
"LOGOUT_URL = '#{platforms_params[:root_url]}/auth/logout/'",
|
||||
"LOGIN_REDIRECT_URL = '#{platforms_params[:root_url]}/'",
|
||||
"ALLOWED_HOSTS = ['some.host.tld', ]",
|
||||
" 'identity': 3,",
|
||||
'HORIZON_CONFIG["password_autocomplete"] = "off"',
|
||||
'HORIZON_CONFIG["images_panel"] = "legacy"',
|
||||
"SECRET_KEY = 'elj1IWiLoWHgcyYxFVLj7cM5rGOOxWl0'",
|
||||
@ -121,7 +120,7 @@ describe 'horizon' do
|
||||
:wsgi_processes => '30',
|
||||
:wsgi_threads => '5',
|
||||
:secure_cookies => true,
|
||||
:api_versions => {'identity' => 2.0},
|
||||
:api_versions => {'identity' => 3},
|
||||
:keystone_multidomain_support => true,
|
||||
:keystone_default_domain => 'domain.tld',
|
||||
:overview_days_range => 1,
|
||||
@ -151,7 +150,7 @@ describe 'horizon' do
|
||||
'CSRF_COOKIE_SECURE = True',
|
||||
'SESSION_COOKIE_SECURE = True',
|
||||
'SESSION_COOKIE_HTTPONLY = True',
|
||||
" 'identity': 2.0,",
|
||||
" 'identity': 3,",
|
||||
"OPENSTACK_KEYSTONE_MULTIDOMAIN_SUPPORT = True",
|
||||
"OPENSTACK_KEYSTONE_DEFAULT_DOMAIN = 'domain.tld'",
|
||||
'HORIZON_CONFIG["password_autocomplete"] = "on"',
|
||||
|
Loading…
x
Reference in New Issue
Block a user