[deltacloud-core: 1/3] Synchronized with F16
Michal Fojtik
mfojtik at fedoraproject.org
Fri Nov 11 16:38:30 UTC 2011
commit bd80ec1fed0cf7eeed2eca6a1072ddc07c9eee47
Author: Michal Fojtik <mi at mifo.sk>
Date: Fri Nov 11 17:34:09 2011 +0100
Synchronized with F16
.gitignore | 6 ++
deltacloud-core.spec | 134 ++++++++++++++++++++++++++++++++++----------------
sources | 12 +++-
3 files changed, 106 insertions(+), 46 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b5c7d74..f41c0dc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,9 @@
/rhevm-long-username-fix.patch
/deltacloud-core-0.4.0.gem
/deltacloud-core.init
+/0001-Backported-r1181859-patches.patch
+/0001-Vsphere-Removed-unnecessary-validation-in-create_ins.patch
+/0002-Google-storage-driver.patch
+/0003-Openstack-driver.patch
+/0004-Fixed-validation-error.patch
+/0005-Fixes-for-launcher.patch
diff --git a/deltacloud-core.spec b/deltacloud-core.spec
index 0b66091..58e2427 100644
--- a/deltacloud-core.spec
+++ b/deltacloud-core.spec
@@ -1,18 +1,22 @@
%global app_root %{_datadir}/%{name}
-%global alphatag rc1
-%global buildnum 273
Summary: Deltacloud REST API
Name: deltacloud-core
-Version: 0.4.0
-Release: 0.5.%{alphatag}%{?dist}
+Version: 0.4.1
+Release: 6%{?dist}
Group: Development/Languages
License: ASL 2.0 and MIT
URL: http://incubator.apache.org/deltacloud
-Source0: https://builds.apache.org/job/apache-deltacloud-core/%{buildnum}/artifact/deltacloud/trunk/server/pkg/%{name}-%{version}.gem
+Source0: http://gems.rubyforge.org/gems/%{name}-%{version}.gem
Source1: deltacloudd-fedora
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
+Patch4: 0003-Openstack-driver.patch
+Patch5: 0004-Fixed-validation-error.patch
+Patch6: 0005-Fixes-for-launcher.patch
Requires: rubygems
Requires: ruby(abi) = 1.8
Requires: rubygem(haml)
@@ -61,7 +65,7 @@ Documentation for %{name}
Summary: Deltacloud Core with all drivers
Requires: %{name} = %{version}-%{release}
#Requires: %{name}-azure
-#Requires: %{name}-condor
+Requires: %{name}-condor
Requires: %{name}-ec2
Requires: %{name}-eucalyptus
Requires: %{name}-gogrid
@@ -72,6 +76,8 @@ Requires: %{name}-rhevm
Requires: %{name}-sbc
Requires: %{name}-terremark
Requires: %{name}-vsphere
+Requires: %{name}-google
+Requires: %{name}-openstack
%description all
Deltacloud core with all available drivers
@@ -87,18 +93,26 @@ Deltacloud core with all available drivers
#The azure sub-package brings in all dependencies necessary to use deltacloud
#core to connect to Azure.
-# FIXME: the required packages are not yet in Fedora, so disable condor for now
-#% package condor
-#Summary: Deltacloud Core for CondorCloud
-#Requires: %{name} = %{version}-%{release}
-#Requires: rubygem(uuid)
-#Requires: rubygem(rest-client)
-#Requires: condor >= 7.4.0
-#Requires: condor-vm-gahp >= 7.4.0
+%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}
+Requires: rubygem(uuidtools)
+Requires: rubygem(rest-client)
+Requires: condor >= 7.4.0
+Requires: condor-vm-gahp >= 7.4.0
-#% description condor
-#The condor sub-package brings in all dependencies necessary to use deltacloud core
-#to connect to CondorCloud.
+%description condor
+The condor sub-package brings in all dependencies necessary to use deltacloud core
+to connect to CondorCloud.
%package ec2
Summary: Deltacloud Core for EC2
@@ -144,6 +158,15 @@ Requires: rubygem(cloudservers)
The rackspace sub-package brings in all dependencies necessary to use deltacloud
core to connect to Rackspace.
+%package openstack
+Summary: Deltacloud Core for OpenStack
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-rackspace
+
+%description openstack
+The rackspace sub-package brings in all dependencies necessary to use deltacloud
+core to connect to OpenStack.
+
%package rhevm
Summary: Deltacloud Core for RHEV-M
Requires: %{name} = %{version}-%{release}
@@ -192,6 +215,12 @@ core to connect to VMware vSphere.
%setup -q -c -T
gem unpack -V --target=%{_builddir} %{SOURCE0}
pushd %{_builddir}/%{name}-%{version}
+%patch1 -p2
+%patch2 -p2
+%patch3 -p2
+%patch4 -p2
+%patch5 -p2
+%patch6 -p2
popd
%build
@@ -210,28 +239,20 @@ find %{buildroot}%{app_root}/lib -type f | xargs chmod -x
chmod -x %{buildroot}%{_sysconfdir}/sysconfig/%{name}
chmod 0755 %{buildroot}%{_initddir}/%{name}
chmod 0755 %{buildroot}%{app_root}/bin/deltacloudd
-rm -rf %{buildroot}%{app_root}/support
# Temporary remove Azure drivers until all dependencies will be pushed in to Fedora
rm -rf %{buildroot}%{app_root}/config/drivers/azure.yaml
-# temporarily remove condor support files until we enable condor
-rm -f %{buildroot}%{app_root}/config/addresses.xml
-rm -f %{buildroot}%{app_root}/config/condor.yaml
-rm -f %{buildroot}%{app_root}/config/drivers/condor.yaml
-
rdoc --op %{buildroot}%{_defaultdocdir}/%{name}
mkdir -p %{buildroot}%{_localstatedir}/log/%{name}
-#% install condor
-#install -m 0655 %{buildroot}%{app_root}/support/condor/config/condor-cloud \
-# %{buildroot}%{_sysconfdir}/sysconfig/condor-cloud
-#install -m 0655 %{buildroot}%{app_root}/support/condor/config/50* \
-# %{buildroot}%{_sysconfdir}/condor/config.d
-#install -m 0755 %{buildroot}%{app_root}/support/condor/bash/* \
-# %{buildroot}%{_libexecdir}/condor
-#rm -rf %{buildroot}%{app_root}/support/condor
+# the condor stuff is provided by the condor-cloud package; it really doesn't
+# belong in deltacloud, but until it is removed from upstream we just manually
+# delete it here
+rm -rf %{buildroot}%{app_root}/support/condor
+
+rm -rf %{buildroot}%{app_root}/support/fedora
%check
pushd %{buildroot}%{app_root}
@@ -289,18 +310,10 @@ fi
#%files azure
-#%files condor
-#%{app_root}/config/drivers/condor.yaml
-#%{app_root}/config/condor.yaml
-#%{app_root}/config/addresses.xml
-#%%config(noreplace) %{_sysconfdir}/sysconfig/condor-cloud
-#%%config(noreplace) %{_sysconfdir}/condor/config.d/50condor_cloud.config
-#%%config(noreplace) %{_sysconfdir}/condor/config.d/50condor_cloud_node.config
-#%{_libexecdir}/condor/cached_images.sh
-#%{_libexecdir}/condor/cloud_exit_hook.sh
-#%{_libexecdir}/condor/cloud_functions
-#%{_libexecdir}/condor/cloud_prepare_hook.sh
-#%{_libexecdir}/condor/libvirt_cloud_script.sh
+%files condor
+%{app_root}/config/drivers/condor.yaml
+%{app_root}/config/condor.yaml
+%{app_root}/config/addresses.xml
%files ec2
%{app_root}/config/drivers/ec2.yaml
@@ -317,6 +330,9 @@ fi
%files rackspace
%{app_root}/config/drivers/rackspace.yaml
+%files openstack
+%{app_root}/config/drivers/openstack.yaml
+
%files rhevm
%{app_root}/config/drivers/rhevm.yaml
@@ -332,7 +348,39 @@ fi
%files vsphere
%{app_root}/config/drivers/vsphere.yaml
+%files google
+%defattr(-, root, root, -)
+%{app_root}/config/drivers/google.yaml
+
%changelog
+* Fri Nov 11 2011 Michal Fojtik <mfojtik at redhat.com> - 0.4.1-6
+- Fixed launcher and init script
+
+* Tue Nov 08 2011 Michal Fojtik <mfojtik at redhat.com> - 0.4.1-5
+- Backported validation fix for Rabbit BZ:750920
+
+* Tue Nov 08 2011 Michal Fojtik <mfojtik at redhat.com> - 0.4.1-4
+- Backported OpenStack driver
+
+* 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
+
+* Wed Oct 12 2011 Michal Fojtik <mfojtik at redhat.com> - 0.4.1-1
+- Version bump (0.4.1)
+
+* Thu Sep 29 2011 Chris Lalancette <clalance at redhat.com> - 0.4.0-4
+- Add a patch to re-enable deltacloud-core-condor
+
+* Thu Sep 15 2011 Chris Lalancette <clalance at redhat.com> - 0.4.0-3
+- 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
diff --git a/sources b/sources
index 750d557..8061a07 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,10 @@
+83a4110796feece905c1911d8b7472d7 deltacloud-core-0.4.1.gem
+c29d9bd8b82d4c8f1c5ac7c69b3e9b22 0001-Backported-r1181859-patches.patch
+5a110ceb808d751cf9ce8fd5497847bb 0002-Google-storage-driver.patch
+360b8ee6e41b4357fe1b2dfa72efa1c0 0001-Vsphere-Removed-unnecessary-validation-in-create_ins.patch
+2f97b62591116a380b319f5beb80f9d9 0003-Openstack-driver.patch
+0b8351b632963e0818f74cfdaad02e20 0004-Fixed-validation-error.patch
+0ce45b479ad4ccf4eb4d2f71a742488d deltacloud-core.init
+fa7ff3ee412817b153abdf8d8d28b6a1 0005-Fixes-for-launcher.patch
b14213ac9ea2a550db5e74c9d074c7c9 deltacloudd-fedora
-abeb7376c76aefa5090414740330124e deltacloud-core-config
-d4b2524f86d006d95475866f5f944d0d deltacloud-core-0.4.0.gem
-e9487309e4c18e328e119310c712b6fb deltacloud-core.init
+04d69921005cfe605aafd081d0768dae deltacloud-core-config
More information about the scm-commits
mailing list