openstack
/
puppet-horizon
Code Issues Proposed changes

Adding options to set can_set_mount_point 

kvm doesn't support specifiying the mount point when adding a volume
so disabling this in the dashboard reduces confusion
This commit is contained in:
Derek Higgins 2013-03-26 13:11:36 -04:00
parent 959c5ab758
commit 29474d1173
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/init.pp
View File

@ -35,6 +35,7 @@ class horizon(
$django_debug = 'False',
$api_result_limit = 1000,
$log_level = 'DEBUG',
$can_set_mount_point = 'True',
$listen_ssl = false
) {

3
spec/classes/horizon_init_spec.rb
View File

@ -42,6 +42,7 @@ describe 'horizon' do
it { should contain_file('/etc/openstack-dashboard/local_settings.py').with_content(/^OPENSTACK_KEYSTONE_DEFAULT_ROLE = "Member"$/) }
it { should contain_file('/etc/openstack-dashboard/local_settings.py').with_content(/^DEBUG = False$/) }
it { should contain_file('/etc/openstack-dashboard/local_settings.py').with_content(/^API_RESULT_LIMIT = 1000$/) }
it { should contain_file('/etc/openstack-dashboard/local_settings.py').with_content(/^\s*'can_set_mount_point': True$/) }
it { should contain_package('horizon').with_ensure('present') }
end
@ -56,6 +57,7 @@ describe 'horizon' do
:keystone_default_role => 'SwiftOperator',
:django_debug => 'True',
:api_result_limit => 4682,
:can_set_mount_point => 'False',
}
end
@ -65,6 +67,7 @@ describe 'horizon' do
it { should contain_file('/etc/openstack-dashboard/local_settings.py').with_content(/^OPENSTACK_KEYSTONE_DEFAULT_ROLE = "SwiftOperator"$/) }
it { should contain_file('/etc/openstack-dashboard/local_settings.py').with_content(/^DEBUG = True$/) }
it { should contain_file('/etc/openstack-dashboard/local_settings.py').with_content(/^API_RESULT_LIMIT = 4682$/) }
it { should contain_file('/etc/openstack-dashboard/local_settings.py').with_content(/^\s*'can_set_mount_point': False$/) }
end
end
describe 'vhost config' do

4
templates/local_settings.py.erb
View File

@ -57,6 +57,10 @@ OPENSTACK_KEYSTONE_BACKEND = {
'can_edit_user': True
}
OPENSTACK_HYPERVISOR_FEATURES = {
'can_set_mount_point': <%= can_set_mount_point %>
}
# OPENSTACK_ENDPOINT_TYPE specifies the endpoint type to use for the endpoints
# in the Keystone service catalog. Use this setting when Horizon is running
# external to the OpenStack environment. The default is 'internalURL'.