Merge "vmware: Fix the wrong package installed"

manifests/compute/vmware.pp

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

manifests/params.pp

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

spec/classes/nova_compute_vmware_spec.rb

@@ -41,13 +41,14 @@ describe 'nova::compute::vmware' do
         is_expected.to contain_nova_config('vmware/datastore_regex').with_value('<SERVICE DEFAULT>')
       end
 
-      it 'installs suds python package' do
-        is_expected.to contain_package('python-suds').with(
-          :ensure => 'present'
+      it 'installs oslo.vmware python package' do
+        is_expected.to contain_package('python-oslo-vmware').with(
+          :ensure => 'present',
+          :name   => 'python3-oslo-vmware',
+          :tag    => ['openstack', 'nova-support-package'],
         )
       end
     end
-  end
 
     context 'with optional parameters' do
       before :each do
@@ -64,6 +65,7 @@ describe 'nova::compute::vmware' do
         is_expected.to contain_nova_config('vmware/datastore_regex').with_value(params[:datastore_regex])
       end
     end
+  end
 
   on_supported_os({
     :supported_os => OSDefaults.get_supported_os