rpms/condor-ec2-enhanced/devel chkconfig_off.patch, NONE, 1.1 condor-ec2-enhanced.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

rrati rrati at fedoraproject.org
Wed Jul 29 14:52:09 UTC 2009


Author: rrati

Update of /cvs/pkgs/rpms/condor-ec2-enhanced/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20576/devel

Modified Files:
	.cvsignore sources 
Added Files:
	chkconfig_off.patch condor-ec2-enhanced.spec import.log 
Log Message:
Initial import


chkconfig_off.patch:
 condor-ec2-enhanced.init |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE chkconfig_off.patch ---
diff -Naur condor-ec2-enhanced-1.0/config/condor-ec2-enhanced.init condor-ec2-enhanced-1.0f/config/condor-ec2-enhanced.init
--- condor-ec2-enhanced-1.0/config/condor-ec2-enhanced.init	2009-07-22 14:13:56.000000000 -0500
+++ condor-ec2-enhanced-1.0f/config/condor-ec2-enhanced.init	2009-07-22 14:15:26.000000000 -0500
@@ -2,7 +2,7 @@
 #
 # condor-ec2-enhanced   This script allows for stopping and starting the condor
 #                       ec2 enhanced daemon caroniad.
-# chkconfig: 2345 91 11
+# chkconfig: - 91 11
 #
 # description: caroniad is the daemon that translates jobs between condor and
 #              Amazon's Web Services for use with condor's EC2 Enhanced


--- NEW FILE condor-ec2-enhanced.spec ---
%{!?is_fedora: %define is_fedora %(/bin/sh -c "if [ -e /etc/fedora-release ];then echo '1'; fi")}
%define rel 16

Summary: EC2 Enhanced
Name: condor-ec2-enhanced
Version: 1.0
Release: %{rel}%{?dist}
License: ASL 2.0
Group: Applications/System
URL: http://www.redhat.com/mrg
# This is a Red Hat maintained package which is specific to
# our distribution.  Thus the source is only available from
# within this srpm.
Source0: %{name}-%{version}-%{rel}.tar.gz
Patch0: chkconfig_off.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch: noarch
Requires: python >= 2.4
Requires: condor >= 7.0.2-4
Requires: condor-job-hooks
Requires: python-condor-job-hooks-common
Requires: python-condor-ec2-enhanced-hooks-common
Requires: python-boto >= 1.7a
Requires: openssl

Requires(post):/sbin/chkconfig
Requires(preun):/sbin/chkconfig
Requires(preun):/sbin/service
Requires(postun):/sbin/service

%description
The EC2 Enhanced feature allows for near seamless translation of Condor jobs
in the standard universe to condor EC2 jobs in the grid universe.  For all
intents and purposes, the job runs as any standard universe job runs except
on an Amazon EC2 AMI instance.

This package contains the daemon that handles the communication between
Condor and the Amazon Web Services (AWS).  This should be installed on an
Amazon Machine Instance (AMI) that will be used with Condor's EC2 Enhanced
feature.

%prep
%setup -q
%if 0%{?is_fedora} != 0
%patch0 -p1
%endif

%build

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_sbindir}
mkdir -p %{buildroot}/%{_sysconfdir}/condor
mkdir -p %{buildroot}/%{_initrddir}
cp -f caroniad %{buildroot}/%_sbindir
cp -f config/caroniad.conf %{buildroot}/%{_sysconfdir}/condor
cp -f config/condor-ec2-enhanced.init %{buildroot}/%{_initrddir}/condor-ec2-enhanced

%clean
rm -rf %{buildroot}

%post
/sbin/chkconfig --add condor-ec2-enhanced
%if 0%{?is_fedora} == 0
if [[ -f /etc/opt/grid/caroniad.conf ]]; then
   mv -f /etc/opt/grid/caroniad.conf /etc/condor
   rmdir --ignore-fail-on-non-empty -p /etc/opt/grid
fi
%endif

%preun
if [ $1 = 0 ]; then
  /sbin/service condor-ec2-enhanced stop >/dev/null 2>&1 || :
  /sbin/chkconfig --del condor-ec2-enhanced
fi

%postun
if [ "$1" -ge "1" ]; then
  /sbin/service condor-ec2-enhanced condrestart >/dev/null 2>&1 || :
fi

%files
%defattr(-,root,root,-)
%doc LICENSE-2.0.txt
%config(noreplace) %_sysconfdir/condor/caroniad.conf
%defattr(0755,root,root,-)
%_initrddir/condor-ec2-enhanced
%_sbindir/caroniad

%changelog
* Mon Jul 27 2009  <rrati at redhat> - 1.0-16
- Fixed missed dependency renames

* Mon Jul 27 2009  <rrati at redhat> - 1.0-15
- Updated dependencies to match hooks-common rename

* Mon Jul 27 2009  <rrati at redhat> - 1.0-14
- Fixed rpmlint/packaging issues

* Wed Jul 22 2009  <rrati at redhat> - 1.0-13
- Added Fedora packaging support

* Wed Jul 22 2009  <rrati at redhat> - 1.0-12
- Moved configuration files to /etc/condor

* Tue Jun  2 2009  <rrati at redhat> - 1.0-11
- Remove RLocks and added better error handling to reduce deadlock potential
- Changes to work with boto 1.7a

* Fri Feb 13 2009  <rrati at redhat> - 1.0-10
- Rebuild bump

* Fri Feb 13 2009  <rrati at redhat> - 1.0-9
- Change source tarball name

* Thu Jan 22 2009  <rrati at redhat> - 1.0-8
- Every time a job is run, a status message denoting a run attempt
  is put in SQS (BZ480841)
- When processing a job, any attributes added by caroniad will be
  removed first to ensure no duplicates
- Fixed issue transfering results to S3 if the job had no data sent

* Mon Dec 15 2008  <rrati at redhat> - 1.0-7
- Daemon no longer returns files created outside the job's iwd
- Upon exit, reset visibility timeout for jobs that haven't finished
- Attempt to access AWS multiple times before shutting down the AMI
- Only package files in the job's iwd
- If TransferOutput is set, only transfer the files listed as well as
  stdout/stderr files if they exist

* Sat Dec 13 2008  <rrati at redhat> - 1.0-6
- Use GlobalJobId as part of unique S3 key
- Each job gets unique results and request queues
- AMI will shutdown if it has problems accessing AWS on startup
- Gracefully handle AWS access issues
- Look for shutdown timer in job ad, and if it exists wait to shutdown

* Tue Dec  9 2008  <rrati at redhat> - 1.0-5
- Fixed JobStatus and Owner reporting issues
- AMI is now shutdown after exit message sent
- Only decrypt the AWS secret access key and then base64 decode
- AMI will only wait 15 minutes for a valid message from SQS
- Handle invalid messages in the work queue

* Sun Dec  7 2008  <rrati at redhat> - 1.0-4
- Ensure only 1 job is handled to completion then shutdown
- Added openssl dependency

* Wed Nov 10 2008  <rrati at redhat> - 1.0-3
- Daemon is on by default

* Fri Nov  4 2008  <rrati at redhat> - 1.0-2
- Add changelog
- Fix rpmlint issues
- Changed init script to condor-ec2-enhanced

* Fri Nov  4 2008  <rrati at redhat> - 1.0-1
- Initial packaging


--- NEW FILE import.log ---
condor-ec2-enhanced-1_0-16_fc10:HEAD:condor-ec2-enhanced-1.0-16.fc10.src.rpm:1248879115


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/condor-ec2-enhanced/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Jul 2009 00:58:49 -0000	1.1
+++ .cvsignore	29 Jul 2009 14:52:09 -0000	1.2
@@ -0,0 +1 @@
+condor-ec2-enhanced-1.0-16.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/condor-ec2-enhanced/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Jul 2009 00:58:49 -0000	1.1
+++ sources	29 Jul 2009 14:52:09 -0000	1.2
@@ -0,0 +1 @@
+762c914ad6fc8fd3e5a9eef47eef852b  condor-ec2-enhanced-1.0-16.tar.gz




More information about the fedora-extras-commits mailing list