diff --git a/attributes/default.rb b/attributes/default.rb index 3ea8086..568d0db 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -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: { diff --git a/spec/horizon_spec.rb b/spec/horizon_spec.rb index 69c2dd5..2821787 100644 --- a/spec/horizon_spec.rb +++ b/spec/horizon_spec.rb @@ -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 diff --git a/templates/default/local_settings.py.erb b/templates/default/local_settings.py.erb index 1701db5..9c94530 100644 --- a/templates/default/local_settings.py.erb +++ b/templates/default/local_settings.py.erb @@ -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.