[deltacloud-core/f16] Patch deltacloud-core to re-enable the condor driver.
Chris Lalancette
clalance at fedoraproject.org
Thu Sep 29 20:23:49 UTC 2011
commit c465c49ce956f819188f76166fe43b488ae4770f
Author: Chris Lalancette <clalance at redhat.com>
Date: Thu Sep 29 16:06:07 2011 -0400
Patch deltacloud-core to re-enable the condor driver.
Now that it has been patched to use uuidtools (which is in
Fedora), we can re-enable this driver.
Signed-off-by: Chris Lalancette <clalance at redhat.com>
...UIDTools-instead-of-UUID-in-condor-driver.patch | 38 +++++++++++
deltacloud-core.spec | 66 ++++++++------------
2 files changed, 65 insertions(+), 39 deletions(-)
---
diff --git a/0001-Use-UUIDTools-instead-of-UUID-in-condor-driver.patch b/0001-Use-UUIDTools-instead-of-UUID-in-condor-driver.patch
new file mode 100644
index 0000000..246202c
--- /dev/null
+++ b/0001-Use-UUIDTools-instead-of-UUID-in-condor-driver.patch
@@ -0,0 +1,38 @@
+From 8456bc150f65f291a8a1898b17f6b64cdd2457c7 Mon Sep 17 00:00:00 2001
+From: Ian Main <imain at redhat.com>
+Date: Thu, 29 Sep 2011 11:49:08 -0700
+Subject: [PATCH] Use UUIDTools instead of UUID in condor driver
+
+This patch updates the condor driver to use UUIDTools as this already
+exists in fedora. I also added the dependency to the gem list. The RPM
+will have to be updated for this dependency as well.
+
+Signed-off-by: Ian Main <imain at redhat.com>
+---
+ server/deltacloud-core.gemspec | 5 +-
+ .../lib/deltacloud/drivers/condor/condor_driver.rb | 4 +-
+ server/support/fedora/deltacloud-core.spec | 69 +++++++++-----------
+ 3 files changed, 37 insertions(+), 41 deletions(-)
+
+diff --git a/server/lib/deltacloud/drivers/condor/condor_driver.rb b/server/lib/deltacloud/drivers/condor/condor_driver.rb
+index 7a61bde..ad444d5 100644
+--- a/server/lib/deltacloud/drivers/condor/condor_driver.rb
++++ b/server/lib/deltacloud/drivers/condor/condor_driver.rb
+@@ -36,7 +36,7 @@ module Deltacloud
+ module Condor
+
+ require 'base64'
+- require 'uuid'
++ require 'uuidtools'
+ require 'fileutils'
+
+ class CondorDriver < Deltacloud::BaseDriver
+@@ -139,7 +139,7 @@ module Deltacloud
+ config_server_address = nil
+ end
+ end
+- vm_uuid ||= UUID::new.generate
++ vm_uuid ||= UUIDTools::UUID.random_create.to_s
+ vm_otp ||= vm_uuid[0..7]
+ new_client(credentials) do |condor|
+ config_server_address ||= condor.ip_agent.address
diff --git a/deltacloud-core.spec b/deltacloud-core.spec
index 59bc820..9ebd427 100644
--- a/deltacloud-core.spec
+++ b/deltacloud-core.spec
@@ -3,7 +3,7 @@
Summary: Deltacloud REST API
Name: deltacloud-core
Version: 0.4.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Group: Development/Languages
License: ASL 2.0 and MIT
URL: http://incubator.apache.org/deltacloud
@@ -11,6 +11,7 @@ Source0: http://gems.rubyforge.org/gems/%{name}-%{version}.gem
Source1: deltacloudd-fedora
Source2: deltacloud-core.init
Source3: deltacloud-core-config
+Patch1: 0001-Use-UUIDTools-instead-of-UUID-in-condor-driver.patch
Requires: rubygems
Requires: ruby(abi) = 1.8
Requires: rubygem(haml)
@@ -59,7 +60,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
@@ -85,18 +86,17 @@ 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 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
@@ -190,6 +190,7 @@ core to connect to VMware vSphere.
%setup -q -c -T
gem unpack -V --target=%{_builddir} %{SOURCE0}
pushd %{_builddir}/%{name}-%{version}
+%patch1 -p2
popd
%build
@@ -208,28 +209,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}
@@ -287,18 +280,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
@@ -331,6 +316,9 @@ fi
%{app_root}/config/drivers/vsphere.yaml
%changelog
+* 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
More information about the scm-commits
mailing list