diff --git a/attributes/default.rb b/attributes/default.rb index 8eb6ae7..2d77bc1 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -163,6 +163,9 @@ default['openstack']['dashboard']['plugins'] = nil default['openstack']['dashboard']['file_upload_temp_dir'] = nil +# disable the v2 openrc download panel by default since v2 has been deprecated for a while +default['openstack']['dashboard']['show_keystone_v2_rc'] = 'False' + default['openstack']['dashboard']['error_log'] = 'openstack-dashboard-error.log' default['openstack']['dashboard']['access_log'] = 'openstack-dashboard-access.log' diff --git a/metadata.rb b/metadata.rb index 3e50b19..f8d0d59 100644 --- a/metadata.rb +++ b/metadata.rb @@ -4,7 +4,7 @@ maintainer_email 'openstack-dev@lists.openstack.org' license 'Apache-2.0' description 'Installs/Configures the OpenStack Dashboard (Horizon)' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version '17.0.0' +version '17.1.0' %w(ubuntu redhat centos).each do |os| supports os diff --git a/templates/default/local_settings.py.erb b/templates/default/local_settings.py.erb index 168b474..2869831 100644 --- a/templates/default/local_settings.py.erb +++ b/templates/default/local_settings.py.erb @@ -649,3 +649,6 @@ mod.INSTALLED_APPS += ('<%= p %>', ) <% if node["openstack"]["dashboard"]["file_upload_temp_dir"] %> FILE_UPLOAD_TEMP_DIR = "<%= node["openstack"]["dashboard"]["file_upload_temp_dir"] %>" <% end %> + +# Controls whether the keystone v2 openrc file is accessable from the user menu and the api access panel. +SHOW_KEYSTONE_V2_RC = <%= node['openstack']['dashboard']['show_keystone_v2_rc'] %>