openstack/puppet-nova
Code Issues Proposed changes

Merge "vmware: Fix the wrong package installed"

Browse Source
This commit is contained in:
Zuul
2023-03-24 05:19:56 +00:00
committed by Gerrit Code Review
parent c4e07e8e07 160ae675a4
commit 86d93c31eb
3 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/compute/vmware.pp
View File

@@ -74,6 +74,7 @@ class nova::compute::vmware(
) { ) {
include nova::deps include nova::deps
include nova::params
nova_config { nova_config {
'DEFAULT/compute_driver': value => $compute_driver; 'DEFAULT/compute_driver': value => $compute_driver;
@@ -90,8 +91,9 @@ class nova::compute::vmware(
'vmware/datastore_regex': value => $datastore_regex; 'vmware/datastore_regex': value => $datastore_regex;
} }
package { 'python-suds': package { 'python-oslo-vmware':
ensure => present, ensure => present,
name => $::nova::params::oslo_vmware_package_name,
tag => ['openstack', 'nova-support-package'], tag => ['openstack', 'nova-support-package'],
} }
} }

6
manifests/params.pp
View File

@@ -32,6 +32,9 @@ class nova::params {
$serialproxy_package_name = 'openstack-nova-serialproxy' $serialproxy_package_name = 'openstack-nova-serialproxy'
$spicehtml5proxy_package_name = 'openstack-nova-console' $spicehtml5proxy_package_name = 'openstack-nova-console'
$ceph_client_package_name = 'ceph-common' $ceph_client_package_name = 'ceph-common'
$oslo_vmware_package_name = 'python3-oslo-vmware'
$mkisofs_package_name = 'xorriso'
$mkisofs_cmd = 'mkisofs'
# service names # service names
$api_service_name = 'openstack-nova-api' $api_service_name = 'openstack-nova-api'
$api_metadata_service_name = undef $api_metadata_service_name = undef
@@ -59,8 +62,6 @@ class nova::params {
$nova_api_wsgi_script_source = '/usr/bin/nova-api-wsgi' $nova_api_wsgi_script_source = '/usr/bin/nova-api-wsgi'
$nova_metadata_wsgi_script_source = '/usr/bin/nova-metadata-wsgi' $nova_metadata_wsgi_script_source = '/usr/bin/nova-metadata-wsgi'
$messagebus_service_name = 'dbus' $messagebus_service_name = 'dbus'
$mkisofs_package_name = 'xorriso'
$mkisofs_cmd = 'mkisofs'
} }
'Debian': { 'Debian': {
# package names # package names
@@ -74,6 +75,7 @@ class nova::params {
$scheduler_package_name = 'nova-scheduler' $scheduler_package_name = 'nova-scheduler'
$tgt_package_name = 'tgt' $tgt_package_name = 'tgt'
$ceph_client_package_name = 'ceph-common' $ceph_client_package_name = 'ceph-common'
$oslo_vmware_package_name = 'python3-oslo-vmware'
$mkisofs_package_name = 'genisoimage' $mkisofs_package_name = 'genisoimage'
$mkisofs_cmd = false $mkisofs_cmd = false
# service names # service names

34
spec/classes/nova_compute_vmware_spec.rb
View File

@@ -41,27 +41,29 @@ describe 'nova::compute::vmware' do
is_expected.to contain_nova_config('vmware/datastore_regex').with_value('<SERVICE DEFAULT>') is_expected.to contain_nova_config('vmware/datastore_regex').with_value('<SERVICE DEFAULT>')
end end
it 'installs suds python package' do it 'installs oslo.vmware python package' do
is_expected.to contain_package('python-suds').with( is_expected.to contain_package('python-oslo-vmware').with(
:ensure => 'present' :ensure => 'present',
:name => 'python3-oslo-vmware',
:tag => ['openstack', 'nova-support-package'],
) )
end end
end end
end
context 'with optional parameters' do context 'with optional parameters' do
before :each do before :each do
params.merge!(optional_params) params.merge!(optional_params)
end end
it 'configures vmwareapi in nova.conf' do it 'configures vmwareapi in nova.conf' do
is_expected.to contain_nova_config('DEFAULT/compute_driver').with_value(params[:compute_driver]) is_expected.to contain_nova_config('DEFAULT/compute_driver').with_value(params[:compute_driver])
is_expected.to contain_nova_config('vmware/api_retry_count').with_value(params[:api_retry_count]) is_expected.to contain_nova_config('vmware/api_retry_count').with_value(params[:api_retry_count])
is_expected.to contain_nova_config('vmware/maximum_objects').with_value(params[:maximum_objects]) is_expected.to contain_nova_config('vmware/maximum_objects').with_value(params[:maximum_objects])
is_expected.to contain_nova_config('vmware/task_poll_interval').with_value(params[:task_poll_interval]) is_expected.to contain_nova_config('vmware/task_poll_interval').with_value(params[:task_poll_interval])
is_expected.to contain_nova_config('vmware/use_linked_clone').with_value(params[:use_linked_clone]) is_expected.to contain_nova_config('vmware/use_linked_clone').with_value(params[:use_linked_clone])
is_expected.to contain_nova_config('vmware/insecure').with_value(params[:insecure]) is_expected.to contain_nova_config('vmware/insecure').with_value(params[:insecure])
is_expected.to contain_nova_config('vmware/datastore_regex').with_value(params[:datastore_regex]) is_expected.to contain_nova_config('vmware/datastore_regex').with_value(params[:datastore_regex])
end
end end
end end