openstack
/
cookbook-openstack-dashboard
Code Issues Proposed changes

Merge "Remove the deprecated properties in horizon."

This commit is contained in:
Jenkins 2015-07-08 01:25:32 +00:00 committed by Gerrit Code Review
parent 8e7ac18b06 a472b6713e
commit b3d97d1ee3
3 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
attributes/default.rb
View File

@ -206,10 +206,7 @@ default['openstack']['dashboard']['log_level']['django'] = 'INFO'
default['openstack']['dashboard']['password_autocomplete'] = 'off'
default['openstack']['dashboard']['simple_ip_management'] = false
default['openstack']['dashboard']['neutron']['enable_lb'] = false
default['openstack']['dashboard']['neutron']['enable_quotas'] = true
default['openstack']['dashboard']['neutron']['enable_firewall'] = false
default['openstack']['dashboard']['neutron']['enable_vpn'] = false
# Allow for misc sections to be added to the local_settings template
# For example: {

16
spec/horizon_spec.rb
View File

@ -403,16 +403,14 @@ describe 'openstack-dashboard::horizon' do
end
context 'neutron settings' do
%w(enable_lb enable_quotas enable_firewall enable_vpn).each do |neutron_setting|
it "enables the #{neutron_setting} setting when the attributes is True" do
node.set['openstack']['dashboard']['neutron'][neutron_setting] = true
expect(chef_run).to render_file(file.name).with_content(/^\s*\'#{neutron_setting}\': True,$/)
end
it 'enables the enable_quotas setting when the attributes is True' do
node.set['openstack']['dashboard']['neutron']['enable_quotas'] = true
expect(chef_run).to render_file(file.name).with_content(/^\s*'enable_quotas': True,$/)
end
it "disables the #{neutron_setting} setting when the attributes is False" do
node.set['openstack']['dashboard']['neutron'][neutron_setting] = false
expect(chef_run).to render_file(file.name).with_content(/^\s*\'#{neutron_setting}\': False,$/)
end
it 'disables the enable_quotas setting when the attributes is False' do
node.set['openstack']['dashboard']['neutron']['enable_quotas'] = false
expect(chef_run).to render_file(file.name).with_content(/^\s*'enable_quotas': False,$/)
end
end

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

@ -210,10 +210,7 @@ OPENSTACK_CINDER_FEATURES = {
# services provided by neutron. Options currently available are load
# balancer service, security groups, quotas, VPN service.
OPENSTACK_NEUTRON_NETWORK = {
'enable_lb': <%= node['openstack']['dashboard']['neutron']['enable_lb'] ? 'True' : 'False' %>,
'enable_firewall': <%= node['openstack']['dashboard']['neutron']['enable_firewall'] ? 'True' : 'False' %>,
'enable_quotas': <%= node['openstack']['dashboard']['neutron']['enable_quotas'] ? 'True' : 'False' %>,
'enable_vpn': <%= node['openstack']['dashboard']['neutron']['enable_vpn'] ? 'True' : 'False' %>,
# The profile_support option is used to detect if an external router can be
# configured via the dashboard. When using specific plugins the
# profile_support can be turned on if needed.