From f82a410d439fddc85af24dff924335c0285fae1f Mon Sep 17 00:00:00 2001
From: Francesco Vollero <fvollero@redhat.com>
Date: Thu, 20 Feb 2014 19:23:22 +0100
Subject: [PATCH] [vmdk] Replaced pip with native package manager

Change-Id: I0603889ad00cbd7fe83c436f1c7273ef0c35b73f
---
 manifests/backend/vmdk.pp                | 5 ++---
 manifests/volume/vmdk.pp                 | 4 ++--
 spec/classes/cinder_volume_vmdk_spec.rb  | 8 ++++----
 spec/defines/cinder_backend_vmdk_spec.rb | 7 +++----
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/manifests/backend/vmdk.pp b/manifests/backend/vmdk.pp
index b390471b..ea14f696 100644
--- a/manifests/backend/vmdk.pp
+++ b/manifests/backend/vmdk.pp
@@ -81,8 +81,7 @@ define cinder::backend::vmdk (
     }
   }
 
-  package { 'suds':
-    ensure   => present,
-    provider => pip
+  package { 'python-suds':
+    ensure   => present
   }
 }
diff --git a/manifests/volume/vmdk.pp b/manifests/volume/vmdk.pp
index 0f0599ec..c435e1db 100644
--- a/manifests/volume/vmdk.pp
+++ b/manifests/volume/vmdk.pp
@@ -45,6 +45,7 @@
 #   (optional) The name for the folder in the VC datacenter that will contain cinder volumes.
 #   Defaults to 'cinder-volumes'.
 #
+
 class cinder::volume::vmdk(
   $host_ip,
   $host_username,
@@ -75,8 +76,7 @@ class cinder::volume::vmdk(
     }
   }
 
-  package { 'suds':
+  package{ 'python-suds':
     ensure   => present,
-    provider => pip
   }
 }
diff --git a/spec/classes/cinder_volume_vmdk_spec.rb b/spec/classes/cinder_volume_vmdk_spec.rb
index 96981eae..0995797d 100644
--- a/spec/classes/cinder_volume_vmdk_spec.rb
+++ b/spec/classes/cinder_volume_vmdk_spec.rb
@@ -34,10 +34,10 @@ describe 'cinder::volume::vmdk' do
     should_not contain_cinder_config('DEFAULT/vmware_wsdl_location')
   end
 
-  it 'installs vmdk driver with pip' do
-    should contain_package('suds').with(
-               :ensure => 'present',
-               :provider => 'pip')
+  it 'installs vmdk python driver' do
+    should contain_package('python-suds').with(
+               :ensure => 'present'
+               )
   end
 
   context 'with optional parameters' do
diff --git a/spec/defines/cinder_backend_vmdk_spec.rb b/spec/defines/cinder_backend_vmdk_spec.rb
index 920b97b9..1e87fe7b 100644
--- a/spec/defines/cinder_backend_vmdk_spec.rb
+++ b/spec/defines/cinder_backend_vmdk_spec.rb
@@ -37,10 +37,9 @@ describe 'cinder::backend::vmdk' do
     should_not contain_cinder_config('hippo/vmware_wsdl_location')
   end
 
-  it 'installs vmdk driver with pip' do
-    should contain_package('suds').with(
-               :ensure => 'present',
-               :provider => 'pip')
+  it 'installs suds python package' do
+    should contain_package('python-suds').with(
+               :ensure => 'present')
   end
 
   context 'with optional parameters' do