Added Attribute for enabling lbaas

* added enable_lb attribute to local_settings.py
* added specs to check the attribute is rendered probably

Change-Id: Icf11d684af41b297b0fdb4995c7b92576abf4a7b
This commit is contained in:
Christoph Albers 2016-03-02 14:41:41 +01:00 committed by Jan Klare
parent 14ce391e1b
commit 885775f8c8
3 changed files with 12 additions and 1 deletions

View File

@ -215,7 +215,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_quotas'] = true
default['openstack']['dashboard']['neutron']['enable_lb'] = false
# Allow for misc sections to be added to the local_settings template
# For example: {
# 'CUSTOM_CONFIG_A' => {

View File

@ -412,6 +412,16 @@ describe 'openstack-dashboard::horizon' do
node.set['openstack']['dashboard']['neutron']['enable_quotas'] = false
expect(chef_run).to render_file(file.name).with_content(/^\s*'enable_quotas': False,$/)
end
context 'lbaas setting' do
it 'enables the enable_lb setting when the attribute is true' do
node.set['openstack']['dashboard']['neutron']['enable_lb'] = true
expect(chef_run).to render_file(file.name).with_content(/^\s*'enable_lb': True,$/)
end
it 'disables the enable_lb setting when the attribute is falase' do
node.set['openstack']['dashboard']['neutron']['enable_lb'] = false
expect(chef_run).to render_file(file.name).with_content(/^\s*'enable_lb': False,$/)
end
end
end
%w(horizon openstack_dashboard novaclient cinderclient keystoneclient

View File

@ -210,6 +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'].to_s.capitalize %>,
'enable_quotas': <%= node['openstack']['dashboard']['neutron']['enable_quotas'] ? '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