openstack/puppet-nova
Code Issues Proposed changes

Remove very old xenserver configs

Browse Source 
* xenapi_inject_image was removed in Diablo.
* connection_type was deprecated in Folsom and removed in Grizzly.

Change-Id: Ib8e7633b96cc1d7a66da9c6261bbd8984a457a3c
This commit is contained in:
Mathieu Gagné
2015-07-07 21:51:55 -04:00
parent 7a7051ab48
commit d6e1fa0481
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
manifests/compute/xenserver.pp
View File

@@ -13,29 +13,31 @@
# [*xenapi_connection_password*] # [*xenapi_connection_password*]
# (required) Password for connection to XenServer/Xen Cloud Platform # (required) Password for connection to XenServer/Xen Cloud Platform
# #
# [*xenapi_inject_image*]
# (optional) This parameter was removed in Diablo and does nothing.
# Defaults to false
#
# [*compute_driver*] # [*compute_driver*]
# (optional) Compute driver. # (optional) Compute driver.
# Defaults to 'xenapi.XenAPIDriver' # Defaults to 'xenapi.XenAPIDriver'
# #
# [*xenapi_inject_image*]
# (optional) DEPRECATED: This parameter does nothing.
#
class nova::compute::xenserver( class nova::compute::xenserver(
$xenapi_connection_url, $xenapi_connection_url,
$xenapi_connection_username, $xenapi_connection_username,
$xenapi_connection_password, $xenapi_connection_password,
$xenapi_inject_image = false, $compute_driver = 'xenapi.XenAPIDriver',
$compute_driver = 'xenapi.XenAPIDriver' # DEPRECATED PARAMETERS
$xenapi_inject_image = undef,
) { ) {
if $xenapi_inject_image != undef {
warning('The xenapi_inject_image parameter is deprecated and has no effect.')
}
nova_config { nova_config {
'DEFAULT/compute_driver': value => $compute_driver; 'DEFAULT/compute_driver': value => $compute_driver;
'DEFAULT/connection_type': value => 'xenapi';
'DEFAULT/xenapi_connection_url': value => $xenapi_connection_url; 'DEFAULT/xenapi_connection_url': value => $xenapi_connection_url;
'DEFAULT/xenapi_connection_username': value => $xenapi_connection_username; 'DEFAULT/xenapi_connection_username': value => $xenapi_connection_username;
'DEFAULT/xenapi_connection_password': value => $xenapi_connection_password; 'DEFAULT/xenapi_connection_password': value => $xenapi_connection_password;
'DEFAULT/xenapi_inject_image': value => $xenapi_inject_image;
} }
ensure_packages(['python-pip']) ensure_packages(['python-pip'])

2
spec/classes/nova_compute_xenserver_spec.rb
View File

@@ -12,11 +12,9 @@ describe 'nova::compute::xenserver' do
it 'configures xenapi in nova.conf' do it 'configures xenapi in nova.conf' do
is_expected.to contain_nova_config('DEFAULT/compute_driver').with_value('xenapi.XenAPIDriver') is_expected.to contain_nova_config('DEFAULT/compute_driver').with_value('xenapi.XenAPIDriver')
is_expected.to contain_nova_config('DEFAULT/connection_type').with_value('xenapi')
is_expected.to contain_nova_config('DEFAULT/xenapi_connection_url').with_value(params[:xenapi_connection_url]) is_expected.to contain_nova_config('DEFAULT/xenapi_connection_url').with_value(params[:xenapi_connection_url])
is_expected.to contain_nova_config('DEFAULT/xenapi_connection_username').with_value(params[:xenapi_connection_username]) is_expected.to contain_nova_config('DEFAULT/xenapi_connection_username').with_value(params[:xenapi_connection_username])
is_expected.to contain_nova_config('DEFAULT/xenapi_connection_password').with_value(params[:xenapi_connection_password]) is_expected.to contain_nova_config('DEFAULT/xenapi_connection_password').with_value(params[:xenapi_connection_password])
is_expected.to contain_nova_config('DEFAULT/xenapi_inject_image').with_value(false)
end end
it 'installs xenapi with pip' do it 'installs xenapi with pip' do