openstack
/
cookbook-openstack-dashboard
Code Issues Proposed changes

Remove reference to deprecated attribute 

The node['openstack']['api']['auth']['version'] was deprecated and should no
longer be used. Default to version 3 for keystone since that's currently what's
supported.

Change-Id: I655e19e31f026be4fe92cbfbbf9d41f37cc6208d
Signed-off-by: Lance Albertson <lance@osuosl.org>
This commit is contained in:
Lance Albertson 2019-06-11 15:29:21 -07:00
parent 9cfbfda022
commit d44b03c2bb
3 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
attributes/default.rb
View File

@ -176,14 +176,7 @@ default['openstack']['dashboard']['session_cookie_secure'] = true
default['openstack']['dashboard']['keystone_multidomain_support'] = false
default['openstack']['dashboard']['keystone_default_domain'] = 'default'
default['openstack']['dashboard']['api']['auth']['version'] = node['openstack']['api']['auth']['version']
case node['openstack']['dashboard']['api']['auth']['version']
when 'v2.0'
default['openstack']['dashboard']['identity_api_version'] = 2.0
when 'v3.0'
default['openstack']['dashboard']['identity_api_version'] = 3
end
default['openstack']['dashboard']['identity_api_version'] = 3
default['openstack']['dashboard']['volume_api_version'] = 2
default['openstack']['dashboard']['console_type'] = 'AUTO'

13
spec/horizon_spec.rb
View File

@ -259,16 +259,6 @@ describe 'openstack-dashboard::horizon' do
expect(chef_run).to render_file(file.name).with_content(line)
end
end
it 'sets the proper value for identity v3.0 with volume default v2 from common attributes' do
node.override['openstack']['api']['auth']['version'] = 'v3.0'
[
/^\s*"identity": 3,$/,
/^\s*"volume": 2$/,
].each do |line|
expect(chef_run).to render_file(file.name).with_content(line)
end
end
end
context 'keystone multidomain support' do
@ -283,8 +273,7 @@ describe 'openstack-dashboard::horizon' do
end
end
it 'has a keystone default domain setting if identity api version is 3' do
node.override['openstack']['dashboard']['identity_api_version'] = 3
it 'has a keystone default domain setting' do
node.override['openstack']['dashboard']['keystone_default_domain'] = 'keystone_default_domain_value'
expect(chef_run).to render_file(file.name).with_content(/^OPENSTACK_KEYSTONE_DEFAULT_DOMAIN = "keystone_default_domain_value"$/)
end

2
templates/default/local_settings.py.erb
View File

@ -61,7 +61,6 @@ OPENSTACK_API_VERSIONS = {
# will require user to enter the Domain name in addition to username for login.
OPENSTACK_KEYSTONE_MULTIDOMAIN_SUPPORT = <%= node["openstack"]["dashboard"]["keystone_multidomain_support"] ? "True" : "False" %>
<% if node["openstack"]["dashboard"]["identity_api_version"] == 3 %>
# Overrides the default domain used when running on single-domain model
# with Keystone V3. All entities will be created in the default domain.
# NOTE: This value must be the ID of the default domain, NOT the name.
@ -69,7 +68,6 @@ OPENSTACK_KEYSTONE_MULTIDOMAIN_SUPPORT = <%= node["openstack"]["dashboard"]["key
# "cloud_admin": "rule:admin_required and domain_id:<your domain id>"
# This value must match the domain id specified there.
OPENSTACK_KEYSTONE_DEFAULT_DOMAIN = "<%= node["openstack"]["dashboard"]["keystone_default_domain"] %>"
<% end %>
# Set Console type:
# valid options would be "AUTO", "VNC", "SPICE" or "RDP"