[openshift-origin-cartridge-abstract] updateing to 1.0.4

tdawson tdawson at fedoraproject.org
Tue Nov 6 17:12:58 UTC 2012 

commit 41c65f99178d6e339f07b56ad8f0510033a4cb82
Author: Troy Dawson <tdawson at redhat.com>
Date:   Tue Nov 6 11:12:50 2012 -0600

    updateing to 1.0.4

 .gitignore                               |    1 +
 openshift-origin-cartridge-abstract.spec |  315 ++++++++++++++++++++++++------
 sources                                  |    2 +-
 3 files changed, 253 insertions(+), 65 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5c6e153..e67e8e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /openshift-origin-cartridge-abstract-0.14.4.tar.gz
+/openshift-origin-cartridge-abstract-1.0.4.tar.gz
diff --git a/openshift-origin-cartridge-abstract.spec b/openshift-origin-cartridge-abstract.spec
index 5b1c3b4..004809e 100644
--- a/openshift-origin-cartridge-abstract.spec
+++ b/openshift-origin-cartridge-abstract.spec
@@ -1,42 +1,44 @@
-%global cartdir %{_libexecdir}/stickshift/cartridges
+%define cartdir %{_libexecdir}/openshift/cartridges
 
-Summary:   OpenShift Origin common cartridge components
+Summary:   OpenShift common cartridge components
 Name:      openshift-origin-cartridge-abstract
-Version:   0.14.4
-Release:   5%{?dist}
+Version:   1.0.4
+Release:   2%{?dist}
+Group:     Network/Daemons
 License:   ASL 2.0
 URL:       http://openshift.redhat.com
-Source0:   http://mirror.openshift.com/pub/openshift-origin/source/%{name}/%{name}-%{version}.tar.gz
+Source0:   http://mirror.openshift.com/pub/origin-server/source/%{name}/%{name}-%{version}.tar.gz
 BuildArch: noarch
-Requires:  git
-Requires:  httpd
+
 Requires:  facter
+Requires:  git
+Requires:  make
 Requires:  mod_ssl
 # abstract/info/connection-hooks/publish-http-url
 Requires:  python
-# abstract/info/connection-hooks/open_ports.sh
+# abstract/info/bin/jenkins_build
+Requires:  ruby
+Requires:  rubygems
+Requires:  rubygem(json)
+# abstract/info/bin/open_ports.sh
 Requires:  socat
-# abstract/info/connection-hooks/nurture_app_push.sh
+# abstract/info/bin/nurture_app_push.sh
 Requires:  curl
-# abstract/info/connection-hooks/sync_gears.sh
+# abstract/info/bin/sync_gears.sh
 Requires:  rsync
 # abstract/info/lib/network
 Requires:  lsof
-# abstract/info/bin/jenkins_build
-Requires:  ruby
-Requires:  rubygems
-Requires:  rubygem(json)
 
+Obsoletes: stickshift-abstract
 
 %description
-This contains the common function used while building 
-openshift cartridges.
+This contains the common function used while building cartridges.
 
-%package jboss
-Summary: OpenShift Origin common jboss cartridge components
-Requires: %{name} = %{version}
+%package   jboss
+Summary:   OpenShift common jboss cartridge components
+Requires:  %{name} = %{version}
 # abstract-jboss/info/bin/build.sh
-Requires: /usr/bin/mvn
+Requires:  /usr/bin/mvn
 
 %description jboss
 This contains the common function used while building 
@@ -49,62 +51,247 @@ openshift jboss cartridges.
 
 %install
 mkdir -p %{buildroot}%{cartdir}
-# Copy over files
 cp -rvp abstract %{buildroot}%{cartdir}/
 cp -rvp abstract-httpd %{buildroot}%{cartdir}/
 cp -rvp abstract-jboss %{buildroot}%{cartdir}/
-# Fix empty files
-echo "# info" >> %{buildroot}%{cartdir}/abstract/info/hooks/info
-echo "# post-install" >> %{buildroot}%{cartdir}/abstract/info/hooks/post-install
-echo "# post-remove" >> %{buildroot}%{cartdir}/abstract/info/hooks/post-remove
-echo "# remove-module" >> %{buildroot}%{cartdir}/abstract/info/hooks/remove-module
-echo "# add-module" >> %{buildroot}%{cartdir}/abstract/info/hooks/add-module
-# Fix permissions
-pushd %{buildroot}%{cartdir}/abstract/info/hooks/
-  chmod 755 *
-  chmod 644 info post-install post-remove remove-module add-module
-popd
-chmod 755 %{buildroot}%{cartdir}/abstract-jboss/info/hooks/configure
+
 # Remove bundled library
 rm -f %{buildroot}%{cartdir}/abstract-jboss/info/data/mysql.tar
 
 %files
 %doc COPYRIGHT LICENSE
-%dir %{_libexecdir}/stickshift/
-%dir %{_libexecdir}/stickshift/cartridges/
-%dir %attr(0755,root,root) %{_libexecdir}/stickshift/cartridges/abstract-httpd/
-%attr(0755,-,-) %{_libexecdir}/stickshift/cartridges/abstract-httpd/info/hooks/
-%attr(0755,-,-) %{_libexecdir}/stickshift/cartridges/abstract-httpd/info/bin/
-%dir %attr(0755,root,root) %{_libexecdir}/stickshift/cartridges/abstract/
-%{_libexecdir}/stickshift/cartridges/abstract/info/hooks/*
-%attr(0755,-,-) %{_libexecdir}/stickshift/cartridges/abstract/info/bin/
-%attr(0755,-,-) %{_libexecdir}/stickshift/cartridges/abstract/info/lib/
-%attr(0755,-,-) %{_libexecdir}/stickshift/cartridges/abstract/info/connection-hooks/
+%dir %{_libexecdir}/openshift/
+%dir %{_libexecdir}/openshift/cartridges/
+%dir %attr(0755,root,root) %{_libexecdir}/openshift/cartridges/abstract-httpd/
+%attr(0750,-,-) %{_libexecdir}/openshift/cartridges/abstract-httpd/info/hooks/
+%attr(0755,-,-) %{_libexecdir}/openshift/cartridges/abstract-httpd/info/bin/
+%dir %attr(0755,root,root) %{_libexecdir}/openshift/cartridges/abstract/
+%dir %attr(0755,root,root) %{_libexecdir}/openshift/cartridges/abstract/info/
+%attr(0750,-,-) %{_libexecdir}/openshift/cartridges/abstract/info/hooks/
+%attr(0755,-,-) %{_libexecdir}/openshift/cartridges/abstract/info/bin/
+%attr(0755,-,-) %{_libexecdir}/openshift/cartridges/abstract/info/lib/
+%attr(0750,-,-) %{_libexecdir}/openshift/cartridges/abstract/info/connection-hooks/
 
 %files jboss
 %doc COPYRIGHT LICENSE
-%dir %attr(0755,root,root) %{_libexecdir}/stickshift/cartridges/abstract-jboss/
-%{_libexecdir}/stickshift/cartridges/abstract-jboss/info/hooks/
-%attr(0755,-,-) %{_libexecdir}/stickshift/cartridges/abstract-jboss/info/bin/
-%attr(0755,-,-) %{_libexecdir}/stickshift/cartridges/abstract-jboss/info/connection-hooks/
-%attr(0755,-,-) %{_libexecdir}/stickshift/cartridges/abstract-jboss/info/data/
-%attr(0644,-,-) %{_libexecdir}/stickshift/cartridges/abstract-jboss/info/configuration/*
+%dir %attr(0755,root,root) %{_libexecdir}/openshift/cartridges/abstract-jboss/
+%dir %attr(0755,root,root) %{_libexecdir}/openshift/cartridges/abstract-jboss/info/
+%attr(0750,-,-) %{_libexecdir}/openshift/cartridges/abstract-jboss/info/hooks/
+%attr(0755,-,-) %{_libexecdir}/openshift/cartridges/abstract-jboss/info/bin/
+%attr(0750,-,-) %{_libexecdir}/openshift/cartridges/abstract-jboss/info/connection-hooks/
+%attr(0750,-,-) %{_libexecdir}/openshift/cartridges/abstract-jboss/info/data/
 
 %changelog
-* Mon Jul 30 2012 Troy Dawson <tdawson at redhat.com> 0.14.4-5
-- Removed mysql.tar from abstract-jboss
-- Have docs just in the normal place
-
-* Mon Jul 30 2012 Troy Dawson <tdawson at redhat.com> 0.14.4-4
+* Tue Nov 06 2012 Troy Dawson <tdawson at redhat.com> 1.0.4-2
+- Cleanup spec for Fedora
+- Added docs to their normal place
+- Added orphaned directories
 - Added dependancies, with what needs them
 - Separated jboss into it's own rpm
+- Removed mysql.tar from abstract-jboss
 
-* Fri Jul 27 2012 Troy Dawson <tdawson at redhat.com> 0.14.4-3
-- Added docs to their normal place
-- Added orphaned directories
+* Fri Nov 02 2012 Adam Miller <admiller at redhat.com> 1.0.4-1
+- Unnecessary to run as system_u and causes test failures.
+  (rmillner at redhat.com)
+- BZ 872008: Use complete context def. (rmillner at redhat.com)
+
+* Thu Nov 01 2012 Adam Miller <admiller at redhat.com> 1.0.3-1
+- Port enable/disable_stale_detection (jhonce at redhat.com)
+
+* Wed Oct 31 2012 Adam Miller <admiller at redhat.com> 1.0.2-1
+- Fix bundle caching during Jenkins builds (ironcladlou at gmail.com)
+
+* Tue Oct 30 2012 Adam Miller <admiller at redhat.com> 1.0.1-1
+- bumping specs to at least 1.0.0 (dmcphers at redhat.com)
+
+* Mon Oct 29 2012 Adam Miller <admiller at redhat.com> 0.17.20-1
+- BZ 867322: Test if a cart was the only cart on a gear was failing.
+  (rmillner at redhat.com)
+
+* Fri Oct 26 2012 Adam Miller <admiller at redhat.com> 0.17.19-1
+- Decouple hook subprocess streams from the parent process
+  (ironcladlou at gmail.com)
+- Fix submodule extraction by expanding ~ properly (ironcladlou at gmail.com)
+- Make stop function work when called prior to any app start
+  (ironcladlou at gmail.com)
+
+* Mon Oct 22 2012 Adam Miller <admiller at redhat.com> 0.17.18-1
+- Merge pull request #724 from Miciah/cartridge-abstract-require-make
+  (openshift+bot at redhat.com)
+- Make cartridge-abstract depend on make (miciah.masters at gmail.com)
+
+* Fri Oct 19 2012 Adam Miller <admiller at redhat.com> 0.17.17-1
+- Merge pull request #717 from pravisankar/dev/ravi/bug/866411
+  (dmcphers at redhat.com)
+- Fix for Bug# 866411 (rpenta at redhat.com)
+- Fix clustering env var references (ironcladlou at gmail.com)
+
+* Thu Oct 18 2012 Adam Miller <admiller at redhat.com> 0.17.16-1
+- Fixing outstanding cgroups issues Removing hardcoded references to "OpenShift
+  guest" and using GEAR_GECOS from node.conf instead (kraman at gmail.com)
+- Fixed broker/node setup scripts to install cgroup services. Fixed
+  mcollective-qpid plugin so it installs during origin package build. Updated
+  cgroups init script to work with both systemd and init.d Updated oo-trap-user
+  script Renamed oo-cgroups to openshift-cgroups (service and init.d) and
+  created oo-admin-ctl-cgroups Pulled in oo-get-mcs-level and abstract/util
+  from origin-selinux branch Fixed invalid file path in rubygem-openshift-
+  origin-auth-mongo spec Fixed invlaid use fo Mcollective::Config in
+  mcollective-qpid-plugin (kraman at gmail.com)
+- Fix mysql-5.1 snapshot for scalable apps (ironcladlou at gmail.com)
+
+* Tue Oct 16 2012 Adam Miller <admiller at redhat.com> 0.17.15-1
+- Merge branch 'master' of https://github.com/openshift/origin-server
+  (bdecoste at gmail.com)
+- jboss use abstract restore_tar and tidy (bdecoste at gmail.com)
+
+* Mon Oct 15 2012 Adam Miller <admiller at redhat.com> 0.17.14-1
+- BZ863937  Need update rhc app tail to rhc tail for output of rhc threaddump
+  command (calfonso at redhat.com)
+- BZ866327 (bdecoste at gmail.com)
+- Merge pull request #661 from ramr/master (openshift+bot at redhat.com)
+- Merge pull request #644 from bdecoste/master (openshift+bot at redhat.com)
+- Don't use rhcsh to control remote dbs. Also fix a typo in the postgres
+  cartridge -- variable name. (ramr at redhat.com)
+- BZ 864519: Fix for git push failing for scalable apps w/ dbs.
+  (mpatel at redhat.com)
+- added tests and enabled ews (bdecoste at gmail.com)
+- Removing old build scripts Moving broker/node setup utilities into util
+  packages Fix Auth service module name conflicts (kraman at gmail.com)
+- Merge pull request #623 from mrunalp/bugs/863998 (openshift+bot at redhat.com)
+- Merge pull request #617 from mrunalp/bugs/util_db_functions_fix
+  (openshift+bot at redhat.com)
+- BZ 863998: Fix path to git repo. (mpatel at redhat.com)
+- Fix functions to get installed dbs. (mpatel at redhat.com)
+- Honor stop_lock during app_ctl stop calls (ironcladlou at gmail.com)
+
+* Mon Oct 08 2012 Dan McPherson <dmcphers at redhat.com> 0.17.13-1
+- suppressing tmp cleanup errors in tidy script (abhgupta at redhat.com)
+- renaming crankcase -> origin-server (dmcphers at redhat.com)
+
+* Fri Oct 05 2012 Krishna Raman <kraman at gmail.com> 0.17.12-1
+- new package built with tito
+
+* Thu Oct 04 2012 Adam Miller <admiller at redhat.com> 0.17.9-1
+- Bug 860240 (dmcphers at redhat.com)
+- Merge pull request #595 from mrunalp/dev/typeless (dmcphers at redhat.com)
+- Typeless gear changes (mpatel at redhat.com)
+
+* Wed Oct 03 2012 Adam Miller <admiller at redhat.com> 0.17.8-1
+- Fix for bugz 859990 - Unidling on ssh. (ramr at redhat.com)
+
+* Fri Sep 28 2012 Adam Miller <admiller at redhat.com> 0.17.7-1
+- Fix for bugz 859565 - .dev.rhcloud.com matches foo-bardev.rhcloud.com
+  (ramr at redhat.com)
+
+* Thu Sep 27 2012 Adam Miller <admiller at redhat.com> 0.17.6-1
+- Detect threaddump on a scalable application and print error.
+  (rmillner at redhat.com)
+
+* Wed Sep 26 2012 Adam Miller <admiller at redhat.com> 0.17.5-1
+- Merge pull request #528 from bdecoste/master (openshift+bot at redhat.com)
+- BZ857143 (bdecoste at gmail.com)
+
+* Mon Sep 24 2012 Adam Miller <admiller at redhat.com> 0.17.4-1
+- Merge pull request #498 from mscherer/add_recursive_submodule
+  (dmcphers at redhat.com)
+- add recursive submodule handling and simply initialization
+  (mscherer at redhat.com)
+
+* Mon Sep 24 2012 Adam Miller <admiller at redhat.com> 0.17.3-1
+- BZ857205 part2 (bdecoste at gmail.com)
+
+* Thu Sep 20 2012 Adam Miller <admiller at redhat.com> 0.17.2-1
+- BZ858605 (bdecoste at gmail.com)
+- BZ857205 (bdecoste at gmail.com)
+- Merge pull request #502 from rajatchopra/master (openshift+bot at redhat.com)
+- fixed started state for extended tests for hot_deploy (bdecoste at gmail.com)
+- fix for bug#858092 (rchopra at redhat.com)
+- US2747 (bdecoste at gmail.com)
+- Merge pull request #479 from rmillner/f17proxy (openshift+bot at redhat.com)
+- The chkconfig test no longer works on F17 and was no longer needed once port-
+  proxy moved to origin-server (rmillner at redhat.com)
+- US2747 (bdecoste at gmail.com)
+
+* Wed Sep 12 2012 Adam Miller <admiller at redhat.com> 0.17.1-1
+- bump_minor_versions for sprint 18 (admiller at redhat.com)
+
+* Fri Sep 07 2012 Adam Miller <admiller at redhat.com> 0.16.4-1
+- Fix for Bug 852268 (jhonce at redhat.com)
+
+* Thu Sep 06 2012 Adam Miller <admiller at redhat.com> 0.16.3-1
+- Fix for bugz 853372 - Failed to move primary cartridge app due to httpd.pid
+  file being empty. (ramr at redhat.com)
+- Fix for bugz 852518 - Failed move due to httpd.pid file being empty.
+  (ramr at redhat.com)
+
+* Thu Aug 30 2012 Adam Miller <admiller at redhat.com> 0.16.2-1
+- Patch for BZ850962 (jhonce at redhat.com)
+
+* Wed Aug 22 2012 Adam Miller <admiller at redhat.com> 0.16.1-1
+- bump_minor_versions for sprint 17 (admiller at redhat.com)
+
+* Tue Aug 21 2012 Adam Miller <admiller at redhat.com> 0.15.7-1
+- support for removing app local environment variables (rchopra at redhat.com)
+
+* Fri Aug 17 2012 Adam Miller <admiller at redhat.com> 0.15.6-1
+- Merge pull request #397 from rmillner/apachectl (openshift+bot at redhat.com)
+- Fedora 17 does away with the init script method of calling configtest and
+  graceful. (rmillner at redhat.com)
+- Wrong path to stats socket. (rmillner at redhat.com)
+- BZ844876: Needed to be more specific with the filter. (rmillner at redhat.com)
+
+* Thu Aug 16 2012 Adam Miller <admiller at redhat.com> 0.15.5-1
+- US2102: Allow PostgreSQL to be embedded in a scalable application.
+  (rmillner at redhat.com)
+
+* Wed Aug 15 2012 Adam Miller <admiller at redhat.com> 0.15.4-1
+- Merge pull request #374 from rajatchopra/US2568 (openshift+bot at redhat.com)
+- Merge pull request #375 from mrunalp/dev/US2696 (openshift+bot at redhat.com)
+- US2696: Support for mysql/mongo cartridge level move. (mpatel at redhat.com)
+- support for app-local ssh key distribution (rchopra at redhat.com)
+
+* Tue Aug 14 2012 Adam Miller <admiller at redhat.com> 0.15.3-1
+- Merge pull request #356 from rmillner/BZ847150 (openshift+bot at redhat.com)
+- Remove Mike's email address and replace it with bofh (admiller at redhat.com)
+- Queue multiple requests behind one httpd graceful or restart call for C9.
+  (rmillner at redhat.com)
+
+* Thu Aug 09 2012 Adam Miller <admiller at redhat.com> 0.15.2-1
+- Create sandbox directory. (rmillner at redhat.com)
+- BZ 845332: Separate out configuration file management from the init script so
+  that systemd properly interprets the daemon restart. (rmillner at redhat.com)
+- Merge pull request #325 from kraman/dev/kraman/features/origin
+  (rmillner at redhat.com)
+- Reducing the amount of entropy needed to generate a password. The extra
+  entropy was being discarded anyway. (kraman at gmail.com)
+
+* Thu Aug 02 2012 Adam Miller <admiller at redhat.com> 0.15.1-1
+- bump_minor_versions for sprint 16 (admiller at redhat.com)
+- BZ 844876: ignore the haproxy status socket (rmillner at redhat.com)
+
+* Tue Jul 31 2012 Adam Miller <admiller at redhat.com> 0.14.9-1
+- Merge pull request #302 from rmillner/dev/rmillner/bug/844123
+  (rchopra at redhat.com)
+- BZ844267 plus abstracted app_ctl_impl.sh (bdecoste at gmail.com)
+- Move direct calls to httpd init script to httpd_singular locking script
+  (rmillner at redhat.com)
+
+* Tue Jul 31 2012 Adam Miller <admiller at redhat.com> 0.14.8-1
+- abstracted app_ctl_impl.sh (bdecoste at gmail.com)
+- BZ844267 plus abstracted app_ctl_impl.sh (bdecoste at gmail.com)
+
+* Tue Jul 31 2012 William DeCoste <wdecoste at redhat.com> 0.14.7-1
+- abstracted app_ctl_impl.sh for JBoss
+
+* Thu Jul 26 2012 Dan McPherson <dmcphers at redhat.com> 0.14.6-1
+- BZ 843354: Don't generate passwords that start with "-".
+  (rmillner at redhat.com)
+- Stand-alone mysql or mongodb gears disable stale detection.
+  (rmillner at redhat.com)
 
-* Mon Jul 23 2012 Troy Dawson <tdawson at redhat.com> 0.14.4-2
-- Fixup for Fedora
+* Tue Jul 24 2012 Adam Miller <admiller at redhat.com> 0.14.5-1
+- Add pre and post destroy calls on gear destruction and move unobfuscate and
+  openshift-origin-proxy out of cartridge hooks and into node. (rmillner at redhat.com)
 
 * Thu Jul 19 2012 Adam Miller <admiller at redhat.com> 0.14.4-1
 - Refactor JBoss hot deployment support (ironcladlou at gmail.com)
@@ -144,7 +331,7 @@ rm -f %{buildroot}%{cartdir}/abstract-jboss/info/data/mysql.tar
   
 * Tue Jul 03 2012 Adam Miller <admiller at redhat.com> 0.13.2-1
 - MCollective updates - Added mcollective-qpid plugin - Added mcollective-
-  gearchanger plugin - Added mcollective agent and facter plugins - Added
+  msg-broker plugin - Added mcollective agent and facter plugins - Added
   option to support ignoring node profile - Added systemu dependency for
   mcollective-client (kraman at gmail.com)
 
@@ -198,8 +385,8 @@ rm -f %{buildroot}%{cartdir}/abstract-jboss/info/data/mysql.tar
 - disabling cgroups for deconfigure and configure events (mmcgrath at redhat.com)
 
 * Tue May 22 2012 Dan McPherson <dmcphers at redhat.com> 0.11.4-1
-- Merge branch 'master' of github.com:openshift/crankcase (rmillner at redhat.com)
-- Merge branch 'US2109' of github.com:openshift/crankcase into US2109
+- Merge branch 'master' of github.com:openshift/origin-server (rmillner at redhat.com)
+- Merge branch 'US2109' of github.com:openshift/origin-server into US2109
   (rmillner at redhat.com)
 - Merge branch 'master' into US2109 (rmillner at redhat.com)
 - Undo proxy code re-introduced via merge (jhonce at redhat.com)
@@ -209,7 +396,7 @@ rm -f %{buildroot}%{cartdir}/abstract-jboss/info/data/mysql.tar
   spitting out an error from providing non-existent path on the command line.
   (rmillner at redhat.com)
 - Data directory moved to ~/app (rmillner at redhat.com)
-- Merge branch 'US2109' of github.com:openshift/crankcase into US2109
+- Merge branch 'US2109' of github.com:openshift/origin-server into US2109
   (rmillner at redhat.com)
 - Merge branch 'master' into US2109 (rmillner at redhat.com)
 - clean up comments etc (jhonce at redhat.com)
@@ -223,7 +410,7 @@ rm -f %{buildroot}%{cartdir}/abstract-jboss/info/data/mysql.tar
   otherwise rhc-accept-node fails and tests fail. (ramr at redhat.com)
 - Cleanup and restore custom env vars support and fixup permissions.
   (ramr at redhat.com)
-- Automatic commit of package [stickshift-abstract] release [0.10.5-1].
+- Automatic commit of package [openshift-origin-cartridge-abstract] release [0.10.5-1].
   (admiller at redhat.com)
 - Fixing bugs related to user hooks. (rmillner at redhat.com)
 - Bug fix - correct app/ directory permissions. (ramr at redhat.com)
diff --git a/sources b/sources
index cc6dab9..e3eca77 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e6b1462cd390117a0c501b593d337e5a  openshift-origin-cartridge-abstract-0.14.4.tar.gz
+92a32ffb3320c9dd7bf3fc4bad98adec  openshift-origin-cartridge-abstract-1.0.4.tar.gz

More information about the scm-commits mailing list