[deltacloud-core/f15] Bugfix for VSphere driver

Fri Oct 21 12:27:08 UTC 2011

commit fef28ebfa382e23662a97c9c2faf52856ed5b588
Author: Michal Fojtik <mi at mifo.sk>
Date:   Fri Oct 21 14:26:55 2011 +0200

    Bugfix for VSphere driver

 .gitignore           |    1 +
 deltacloud-core.spec |  127 ++++++++++++++++++++++++++++++--------------------
 sources              |    1 +
 3 files changed, 78 insertions(+), 51 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 8b0b7c5..bc174de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /0001-Backported-r1181859-patches.patch
 /0002-Google-storage-driver.patch
 /deltacloud-core-0.4.1.gem
+/0001-Vsphere-Removed-unnecessary-validation-in-create_ins.patch
diff --git a/deltacloud-core.spec b/deltacloud-core.spec
index de4bca2..afbd59f 100644
--- a/deltacloud-core.spec
+++ b/deltacloud-core.spec
@@ -3,7 +3,7 @@
 Summary: Deltacloud REST API
 Name: deltacloud-core
 Version: 0.4.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: Development/Languages
 License: ASL 2.0 and MIT
 URL: http://incubator.apache.org/deltacloud
@@ -13,6 +13,7 @@ Source2: deltacloud-core.init
 Source3: deltacloud-core-config
 Patch1: 0002-Google-storage-driver.patch
 Patch2: 0001-Backported-r1181859-patches.patch
+Patch3: 0001-Vsphere-Removed-unnecessary-validation-in-create_ins.patch
 Requires: rubygems
 Requires: ruby(abi) = 1.8
 Requires: rubygem(haml)
@@ -41,8 +42,7 @@ BuildRequires: rubygem(rack-test) >= 0.5.0
 BuildRequires: rubygem(rspec) >= 1.3.0
 BuildRequires: rubygem(json) >= 1.4.0
 BuildArch: noarch
-Provides: rubygem(deltacloud-core)
-Provides: deltacloud-core-mock
+Obsoletes: rubygem-deltacloud-core
 
 %description
 The Deltacloud API is built as a service-based REST API.
@@ -61,32 +61,25 @@ Documentation for %{name}
 %package all
 Summary: Deltacloud Core with all drivers
 Requires: %{name} = %{version}-%{release}
-#Requires: %{name}-azure = %{version}-%{release}
-Requires: %{name}-condor = %{version}-%{release}
-Requires: %{name}-ec2 = %{version}-%{release}
-Requires: %{name}-eucalyptus = %{version}-%{release}
-Requires: %{name}-gogrid = %{version}-%{release}
-Requires: %{name}-opennebula = %{version}-%{release}
-Requires: %{name}-rackspace = %{version}-%{release}
-Requires: %{name}-rimuhosting = %{version}-%{release}
-Requires: %{name}-rhevm = %{version}-%{release}
-Requires: %{name}-sbc = %{version}-%{release}
-Requires: %{name}-terremark = %{version}-%{release}
-Requires: %{name}-vsphere = %{version}-%{release}
-Requires: %{name}-google
+#Requires: %{name}-azure
+Requires: %{name}-condor
+Requires: %{name}-ec2
+Requires: %{name}-eucalyptus
+Requires: %{name}-gogrid
+Requires: %{name}-opennebula
+Requires: %{name}-rackspace
+Requires: %{name}-rimuhosting
+Requires: %{name}-rhevm
+Requires: %{name}-sbc
+#Requires: %{name}-terremark
+Requires: %{name}-vsphere
+#Requires: %{name}-google
 
 %description all
 Deltacloud core with all available drivers
 
-%package google
-Summary: Deltacloud Core for Google storage
-Requires: %{name} = %{version}-%{release}
-Requires: rubygem(fog)
-
-%description google
-The google sub-package brings in all dependencies necessary to use deltacloud
-core to connect to Google Storage.
-
+# FIXME: Azure requires waz-blobs gem which is not yet included in Fedora repos
+#
 #% package azure
 #Summary: Deltacloud Core for Azure
 #Requires: %{name} = %{version}-%{release}
@@ -96,6 +89,17 @@ core to connect to Google Storage.
 #The azure sub-package brings in all dependencies necessary to use deltacloud
 #core to connect to Azure.
 
+# FIXME: Google require 'fog' gem which is not packaged for F15 
+#
+#%package google
+#Summary: Deltacloud Core for Google storage
+#Requires: %{name} = %{version}-%{release}
+#Requires: rubygem(fog)
+#
+#%description google
+#The google sub-package brings in all dependencies necessary to use deltacloud
+#core to connect to Google Storage.
+
 %package condor
 Summary: Deltacloud Core for CondorCloud
 Requires: %{name} = %{version}-%{release}
@@ -177,15 +181,15 @@ Requires: %{name} = %{version}-%{release}
 The sbc sub-package brings in all dependencies necessary to use deltacloud core
 to connect to SBC.
 
-%package terremark
-Summary: Deltacloud Core for Terremark
-Requires: %{name} = %{version}-%{release}
-Requires: rubygem(fog)
-Requires: rubygem(excon)
+#%package terremark
+#Summary: Deltacloud Core for Terremark
+#Requires: %{name} = %{version}-%{release}
+#Requires: rubygem(fog)
+#Requires: rubygem(excon)
 
-%description terremark
-The terremark sub-package brings in all dependencies necessary to use deltacloud
-core to connect to Terremark.
+#%description terremark
+#The terremark sub-package brings in all dependencies necessary to use deltacloud
+#core to connect to Terremark.
 
 %package vsphere
 Summary: Deltacloud Core for vSphere
@@ -201,6 +205,8 @@ core to connect to VMware vSphere.
 gem unpack -V --target=%{_builddir} %{SOURCE0}
 pushd %{_builddir}/%{name}-%{version}
 %patch1 -p2
+%patch2 -p2
+%patch3 -p2
 popd
 
 %build
@@ -220,8 +226,10 @@ chmod -x %{buildroot}%{_sysconfdir}/sysconfig/%{name}
 chmod 0755 %{buildroot}%{_initddir}/%{name}
 chmod 0755 %{buildroot}%{app_root}/bin/deltacloudd
 
-# temporarily remove Azure drivers until all dependencies will be pushed in to Fedora
+# Temporary remove Azure drivers until all dependencies will be pushed in to Fedora
 rm -rf %{buildroot}%{app_root}/config/drivers/azure.yaml
+rm -rf %{buildroot}%{app_root}/config/drivers/terremark.yaml
+rm -rf %{buildroot}%{app_root}/config/drivers/google.yaml
 
 rdoc --op %{buildroot}%{_defaultdocdir}/%{name}
 
@@ -319,17 +327,20 @@ fi
 %files sbc
 %{app_root}/config/drivers/sbc.yaml
 
-%files terremark
-%{app_root}/config/drivers/terremark.yaml
+#%files terremark
+#%{app_root}/config/drivers/terremark.yaml
 
 %files vsphere
 %{app_root}/config/drivers/vsphere.yaml
 
-%files google
-%defattr(-, root, root, -)
-%{app_root}/config/drivers/google.yaml
+#%files google
+#%defattr(-, root, root, -)
+#%{app_root}/config/drivers/google.yaml
 
 %changelog
+* Wed Oct 21 2011 Michal Fojtik <mfojtik at redhat.com> - 0.4.1-3
+- Backported fix for VSphere driver
+
 * Wed Oct 12 2011 Michal Fojtik <mfojtik at redhat.com> - 0.4.1-2
 - Backported latest fixes in hardware profiles
 - Backported Google Storage driver
@@ -341,24 +352,38 @@ fi
 - Add a patch to re-enable deltacloud-core-condor
 
 * Thu Sep 15 2011 Chris Lalancette <clalance at redhat.com> - 0.4.0-3
-- Update specfile to bring in vsphere
+- Fixes to the initscript and release bump
+
+* Thu Sep 15 2011 Chris Lalancette <clalance at redhat.com> - 0.4.0-2
+- Update to 0.4.0 release
+
+* Wed Sep 14 2011 Chris Lalancette <clalance at redhat.com> - 0.4.0-0.5.rc1
+- Remember to actually include the log directory in files
+
+* Wed Sep 14 2011 Chris Lalancette <clalance at redhat.com> - 0.4.0-0.4.rc1
+- Bump release to add dist tag
 
-* Thu Sep 15 2011 Michal Fojtik <mfojtik at redhat.com> - 0.4.0-2
-- Updated release tag to not conflict with nightly builds
-- Removed obsoleted patches from spec file
+* Wed Sep 14 2011 Chris Lalancette <clalance at redhat.com> - 0.4.0-0.3.rc1
+- Add patches to fix up deltacloud-core initscript
+- Clean up the specfile (sort subpackages in alphabetical order)
+- Disable deltacloud-core-condor subpackage for now (since it doesn't work)
+- Make sure the log directory is owned by nobody:nobody
 
-* Thu Sep 15 2011 Michal Fojtik <mfojtik at redhat.com> - 0.4.0-1
+* Wed Jul 17 2011 Michal Fojtik <mfojtik at redhat.com> - 0.4.0-0.2.rc1
+- Removed mock subpackage since it's part of main deltacloud-core package
+
+* Mon Jul 11 2011 Michal Fojtik <mfojtik at redhat.com> - 0.4.0-0.1.rc1
 - Version bump to 0.4.0
+- Added CondorCloud driver
 
-* Wed Sep 14 2011 Chris Lalancette <clalance at redhat.com> - 0.3.0-11
-- Update to newer initscript to fix problems starting under systemd
-- Specfile cleanup
+* Mon Jul 11 2011 Michal Fojtik <mfojtik at redhat.com> - 0.3.0-11
+- Added virtual package with all drivers
 
-* Fri Jun 3 2011 Michal Fojtik <mfojtik at redhat.com> - 0.3.0-10
-- Removed Azure and Terremark driver because of unsatisfied dependencies
+* Fri Jun 7 2011 Michal Fojtik <mfojtik at redhat.com> - 0.3.0-10
+- Added patch to handle long usernames
 
-* Thu Jun 2 2011 Michal Fojtik <mfojtik at redhat.com> - 0.3.0-9
-- Replaced Obsoletes with Provides
+* Fri Jun 3 2011 Michal Fojtik <mfojtik at redhat.com> - 0.3.0-9
+- Removed Azure and Terremark driver because of unsatisfied dependencies
 
 * Tue May 31 2011 Chris Lalancette <clalance at redhat.com> - 0.3.0-8
 - Create sub-packages to bring in dependencies
diff --git a/sources b/sources
index a70f1e7..e7a6901 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
 c29d9bd8b82d4c8f1c5ac7c69b3e9b22  0001-Backported-r1181859-patches.patch
 5a110ceb808d751cf9ce8fd5497847bb  0002-Google-storage-driver.patch
 83a4110796feece905c1911d8b7472d7  deltacloud-core-0.4.1.gem
+360b8ee6e41b4357fe1b2dfa72efa1c0  0001-Vsphere-Removed-unnecessary-validation-in-create_ins.patch
