[openshift-origin-broker-util] update to 1.9.7
tdawson
tdawson at fedoraproject.org
Tue Jun 11 23:06:11 UTC 2013
commit 5d7b3e47531760c5d263e37cc5315fe96a39c969
Author: Troy Dawson <tdawson at redhat.com>
Date: Tue Jun 11 18:05:41 2013 -0500
update to 1.9.7
.gitignore | 1 +
openshift-origin-broker-util.spec | 313 ++++++++++++++++++++++++++++++++++---
sources | 2 +-
3 files changed, 291 insertions(+), 25 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b9e2c92..4eb8ea8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/openshift-origin-broker-util-1.3.6.tar.gz
/openshift-origin-broker-util-1.4.13.tar.gz
/openshift-origin-broker-util-1.5.12.tar.gz
+/openshift-origin-broker-util-1.9.7.tar.gz
diff --git a/openshift-origin-broker-util.spec b/openshift-origin-broker-util.spec
index ca73f99..3cfe87d 100644
--- a/openshift-origin-broker-util.spec
+++ b/openshift-origin-broker-util.spec
@@ -2,11 +2,11 @@
Summary: Utility scripts for the OpenShift Origin broker
Name: openshift-origin-broker-util
-Version: 1.5.12
-Release: 3%{?dist}
+Version: 1.9.7
+Release: 1%{?dist}
Group: Network/Daemons
License: ASL 2.0
-URL: http://openshift.redhat.com
+URL: http://www.openshift.com
Source0: http://mirror.openshift.com/pub/openshift-origin/source/%{name}/%{name}-%{version}.tar.gz
%if 0%{?fedora} >= 19
Requires: ruby(release)
@@ -14,19 +14,16 @@ Requires: ruby(release)
Requires: %{?scl:%scl_prefix}ruby(abi) >= %{rubyabi}
%endif
Requires: openshift-origin-broker
+Requires: %{?scl:%scl_prefix}rubygem-rest-client
+Requires: mongodb
# For oo-register-dns
Requires: bind-utils
-# For oo-setup-bind
-Requires: rng-tools
-Requires: rubygem(openshift-origin-dns-bind)
-# For oo-setup-broker
-Requires: openssl
-Requires: %{?scl:%scl_prefix}rubygem(open4)
-Requires: rubygem(openshift-origin-auth-mongo)
-BuildArch: noarch
+# For oo-admin-broker-auth
+Requires: mcollective-client
+BuildArch: noarch
%description
-This package contains a set of utility scripts for the openshift broker.
+This package contains a set of utility scripts for the openshift broker.
They must be run on a openshift broker instance.
%prep
@@ -39,13 +36,12 @@ mkdir -p %{buildroot}%{_sbindir}
cp -p oo-* %{buildroot}%{_sbindir}/
mkdir -p %{buildroot}%{_mandir}/man8/
-cp -p man/*.8 %{buildroot}%{_mandir}/man8/
-mkdir -p %{buildroot}/usr/share/openshift/kickstarts
-cp -p kickstart/openshift-origin-remix.ks %{buildroot}/usr/share/openshift/kickstarts
+cp man/*.8 %{buildroot}%{_mandir}/man8/
%files
%doc LICENSE
%attr(0750,-,-) %{_sbindir}/oo-admin-chk
+%attr(0750,-,-) %{_sbindir}/oo-admin-repair
%attr(0750,-,-) %{_sbindir}/oo-admin-clear-pending-ops
%attr(0750,-,-) %{_sbindir}/oo-admin-ctl-app
%attr(0750,-,-) %{_sbindir}/oo-admin-ctl-authorization
@@ -54,36 +50,305 @@ cp -p kickstart/openshift-origin-remix.ks %{buildroot}/usr/share/openshift/kicks
%attr(0750,-,-) %{_sbindir}/oo-admin-ctl-usage
%attr(0750,-,-) %{_sbindir}/oo-admin-ctl-user
%attr(0750,-,-) %{_sbindir}/oo-admin-move
+%attr(0750,-,-) %{_sbindir}/oo-admin-broker-auth
+%attr(0750,-,-) %{_sbindir}/oo-admin-broker-cache
%attr(0750,-,-) %{_sbindir}/oo-admin-usage
+%attr(0750,-,-) %{_sbindir}/oo-analytics-export
+%attr(0750,-,-) %{_sbindir}/oo-analytics-import
%attr(0750,-,-) %{_sbindir}/oo-register-dns
-%attr(0750,-,-) %{_sbindir}/oo-setup-bind
-%attr(0750,-,-) %{_sbindir}/oo-setup-broker
%attr(0750,-,-) %{_sbindir}/oo-accept-broker
%attr(0750,-,-) %{_sbindir}/oo-accept-systems
%attr(0750,-,-) %{_sbindir}/oo-stats
-%dir /usr/share/openshift
-%dir /usr/share/openshift/kickstarts
-/usr/share/openshift/kickstarts/openshift-origin-remix.ks
+
%{_mandir}/man8/oo-admin-chk.8.gz
+%{_mandir}/man8/oo-admin-repair.8.gz
%{_mandir}/man8/oo-admin-ctl-app.8.gz
%{_mandir}/man8/oo-admin-ctl-district.8.gz
%{_mandir}/man8/oo-admin-ctl-domain.8.gz
%{_mandir}/man8/oo-admin-ctl-usage.8.gz
%{_mandir}/man8/oo-admin-ctl-user.8.gz
%{_mandir}/man8/oo-admin-move.8.gz
+%{_mandir}/man8/oo-admin-broker-auth.8.gz
+%{_mandir}/man8/oo-admin-broker-cache.8.gz
%{_mandir}/man8/oo-admin-usage.8.gz
%{_mandir}/man8/oo-register-dns.8.gz
-%{_mandir}/man8/oo-setup-bind.8.gz
-%{_mandir}/man8/oo-setup-broker.8.gz
%{_mandir}/man8/oo-accept-broker.8.gz
%{_mandir}/man8/oo-accept-systems.8.gz
%{_mandir}/man8/oo-stats.8.gz
%changelog
-* Wed Mar 13 2013 Troy Dawson <tdawson at redhat.com> - 1.5.12-3
+* Thu May 30 2013 Adam Miller <admiller at redhat.com> 1.9.7-1
+- Checking consumed gears mismatch only if requested (abhgupta at redhat.com)
+
+* Wed May 29 2013 Adam Miller <admiller at redhat.com> 1.9.6-1
+- fix clear-pending-ops script to handle created_at.nil? (rchopra at redhat.com)
+
+* Thu May 23 2013 Adam Miller <admiller at redhat.com> 1.9.5-1
+- Merge pull request #2607 from rajatchopra/master (dmcphers at redhat.com)
+- Merge pull request #2602 from tbielawa/grammarfix
+ (dmcphers+openshiftbot at redhat.com)
+- fix bz965949 - include Mongo as object qualifier (rchopra at redhat.com)
+- Rebuild that man page (tbielawa at redhat.com)
+- Grammar fix in oo-admin-ctl-user man page (tbielawa at redhat.com)
+- Renaming oo-admin-fix to oo-admin-repair (abhgupta at redhat.com)
+
+* Wed May 22 2013 Adam Miller <admiller at redhat.com> 1.9.4-1
+- clean pending ops script to ensure rollbacks when needed; fix downloaded
+ manifest screening (rchopra at redhat.com)
+- Merge pull request #2499 from lnader/master
+ (dmcphers+openshiftbot at redhat.com)
+- Bug 957164 (lnader at redhat.com)
+
+* Mon May 20 2013 Dan McPherson <dmcphers at redhat.com> 1.9.3-1
+- Merge pull request #2540 from pravisankar/dev/ravi/bug963981
+ (dmcphers+openshiftbot at redhat.com)
+- Bug 963981 - Fix app events controller Use canonical_name/canonical_namespace
+ for application/domain respectively when using find_by op.
+ (rpenta at redhat.com)
+- Fixes based on review by Ravi (abhgupta at redhat.com)
+
+* Thu May 16 2013 Adam Miller <admiller at redhat.com> 1.9.2-1
+- Fix for bug 963654 (abhgupta at redhat.com)
+- add parent_user_id to user collection for export (rchopra at redhat.com)
+- Fixing broken check to confirm gear UID existence in mongo
+ (abhgupta at redhat.com)
+- Merge pull request #2477 from detiber/bz958573
+ (dmcphers+openshiftbot at redhat.com)
+- Merge pull request #2470 from lnader/536 (dmcphers+openshiftbot at redhat.com)
+- <oo-admin-chk> Bug 958573 - Fix output when ssh key mismatch found
+ (jdetiber at redhat.com)
+- online_broker_536 (lnader at redhat.com)
+- Initial implementation for fixing district available UID mismatch
+ (abhgupta at redhat.com)
+- Initial implementation for fixing consumed gears mismatch
+ (abhgupta at redhat.com)
+- Merge pull request #2444 from detiber/bz961255
+ (dmcphers+openshiftbot at redhat.com)
+- <controller,broker-util> Bug 961255 - DataStore fixes for mongo ssl
+ (jdetiber at redhat.com)
+- <oo-accept-broker> Bug 959164 - Fix mongo test with replica sets
+ (jdetiber at redhat.com)
+- analytics should contain user login too (rchopra at redhat.com)
+
+* Wed May 08 2013 Adam Miller <admiller at redhat.com> 1.9.1-1
+- bump_minor_versions for sprint 28 (admiller at redhat.com)
+
+* Tue May 07 2013 Adam Miller <admiller at redhat.com> 1.8.7-1
+- improved analytics import script that logs more information about what is
+ going on (rchopra at redhat.com)
+
+* Fri May 03 2013 Adam Miller <admiller at redhat.com> 1.8.6-1
+- <broker><oo-accept-broker> Bug 958674 - Fix Mongo SSL support
+ (jdetiber at redhat.com)
+
+* Wed May 01 2013 Adam Miller <admiller at redhat.com> 1.8.5-1
+- Fix for bug 956441 - increasing mcollective timeout for oo-admin-chk
+ (abhgupta at redhat.com)
+- Merge pull request #2308 from detiber/bz958437
+ (dmcphers+openshiftbot at redhat.com)
+- reslience to broken apps in analytics import cleanup (rchopra at redhat.com)
+- <oo-accept-broker> Bug 958437 - Making CONSOLE_SECRET check dependent on
+ existence of CONSOLE_CONF (jdetiber at redhat.com)
+- Merge pull request #2288 from detiber/bz955789
+ (dmcphers+openshiftbot at redhat.com)
+- fix oo-analytics-import to use global authentication for new db
+ (rchopra at redhat.com)
+- Bug 955789 - Enabling mongo connection check in oo-accept-broker
+ (jdetiber at redhat.com)
+- Fixing typo (abhgupta at redhat.com)
+
+* Tue Apr 30 2013 Adam Miller <admiller at redhat.com> 1.8.4-1
+- Merge pull request #2279 from abhgupta/abhgupta-dev
+ (dmcphers+openshiftbot at redhat.com)
+- Merge pull request #2230 from pravisankar/dev/ravi/card559
+ (dmcphers+openshiftbot at redhat.com)
+- Displaying the count of applications fixed/failed for ssh key mismatches
+ (abhgupta at redhat.com)
+- Preventing false positives from being reported for oo-admin-chk and bug fixes
+ - Fix for bug 954800 - Fix for bug 955187 - Fix for bug 955359
+ (abhgupta at redhat.com)
+- Merge pull request #2263 from sosiouxme/bz957818
+ (dmcphers+openshiftbot at redhat.com)
+- <cache> bug 957818 - clear-cache script, oo-cart-version uses it
+ (lmeyer at redhat.com)
+- Removed 'setmaxstorage' option for oo-admin-ctl-user script. Added
+ 'setmaxtrackedstorage' and 'setmaxuntrackedstorage' options for oo-admin-ctl-
+ user script. Updated oo-admin-ctl-user man page. Max allowed additional fs
+ storage for user will be 'max_untracked_addtl_storage_per_gear' capability +
+ 'max_tracked_addtl_storage_per_gear' capability. Don't record usage for
+ additional fs storage if it is less than
+ 'max_untracked_addtl_storage_per_gear' limit. Fixed unit tests and models to
+ accommodate the above change. (rpenta at redhat.com)
+
+* Mon Apr 29 2013 Adam Miller <admiller at redhat.com> 1.8.3-1
+- Fixing the rest-client dependency in broker-util (bleanhar at redhat.com)
+- Bug 957045 - fixing oo-accept-systems for v2 cartridges (bleanhar at redhat.com)
+
+* Thu Apr 25 2013 Adam Miller <admiller at redhat.com> 1.8.2-1
+- Merge pull request #2240 from detiber/bz956670
+ (dmcphers+openshiftbot at redhat.com)
+- Bug 956670 - Fix static references to small gear size (jdetiber at redhat.com)
+
+* Thu Apr 25 2013 Adam Miller <admiller at redhat.com> 1.8.1-1
+- Merge pull request #2222 from detiber/sessionsecret
+ (dmcphers+openshiftbot at redhat.com)
+- <oo-accept-broker> Fix test for SESSION_SECRET (jdetiber at redhat.com)
+- <broker> Updated spec file for correct user_action.log location <oo-accept-
+ broker> Added permission check for rest api logs (jdetiber at redhat.com)
+- Creating fixer mechanism for replacing all ssh keys for an app
+ (abhgupta at redhat.com)
+- <oo-accept-broker> test for oo-ruby in path (jolamb at redhat.com)
+- <oo-accept-broker> replace safe_ruby fxn wrapper with oo-ruby
+ (jolamb at redhat.com)
+- <oo-accept-broker> more rhel/fedora reconciliation, cleanup
+ (jolamb at redhat.com)
+- <oo-accept-broker> cleanup, documentation comment (jolamb at redhat.com)
+- <oo-accept-broker> Fixes to generalize over RHEL and Fedora
+ (jolamb at redhat.com)
+- Bug 928675 (asari.ruby at gmail.com)
+- Merge pull request #2155 from rajatchopra/master
+ (dmcphers+openshiftbot at redhat.com)
+- Merge pull request #2152 from pravisankar/dev/ravi/plan_history_cleanup
+ (dmcphers+openshiftbot at redhat.com)
+- eventual consistency is alright in some cases (rchopra at redhat.com)
+- Added pre_sync_usage, post_sync_usage operations in oo-admin-ctl-usage script
+ (rpenta at redhat.com)
+- refix unreserve_uid when destroying gear (rchopra at redhat.com)
+- unreserve should not happen twice over (rchopra at redhat.com)
+- Adding support for Bearer auth in the sample remote-user plugin
+ (bleanhar at redhat.com)
+- bump_minor_versions for sprint 2.0.26 (tdawson at redhat.com)
+
+* Tue Apr 16 2013 Troy Dawson <tdawson at redhat.com> 1.7.7-1
+- Fix for bug 952551 Preventing the removal of gears that host singletons
+ through admin script (abhgupta at redhat.com)
+
+* Sat Apr 13 2013 Krishna Raman <kraman at gmail.com> 1.7.6-1
+- Merge pull request #2042 from maxamillion/dev/maxamillion/oo-accept-cleanup
+ (dmcphers+openshiftbot at redhat.com)
+- fix '[: ==: unary operator expected' errors (admiller at redhat.com)
+
+* Fri Apr 12 2013 Adam Miller <admiller at redhat.com> 1.7.5-1
+- Merge pull request #2018 from abhgupta/abhgupta-dev (dmcphers at redhat.com)
+- Merge pull request #2026 from rajatchopra/master (dmcphers at redhat.com)
+- fix analytics to provide more details (rchopra at redhat.com)
+- Fix for bug 950974 Handling NodeException in the script (abhgupta at redhat.com)
+- Fix for bug 951031 We are now correctly listing the acceptable argument to
+ the oo-admin-usage script as gear id instead of gear uuid
+ (abhgupta at redhat.com)
+
+* Thu Apr 11 2013 Adam Miller <admiller at redhat.com> 1.7.4-1
+- Merge pull request #2001 from brenton/misc2 (dmcphers at redhat.com)
+- Merge pull request #1998 from pravisankar/dev/ravi/card526
+ (dmcphers at redhat.com)
+- oo-admin-broker-auth manpage fix (bleanhar at redhat.com)
+- Add 'plan_history' to CloudUser model. oo-admin-ctl-usage will also cache
+ 'plan_history' and will pass to sync_usage(). (rpenta at redhat.com)
+
+* Wed Apr 10 2013 Adam Miller <admiller at redhat.com> 1.7.3-1
+- Bug 949819 (lnader at redhat.com)
+- Change 'allow_change_district' to 'change_district' and remove warnings when
+ target server or district is specified. Fix start/stop carts order in move
+ gear. (rpenta at redhat.com)
+- Adding checks for ssh key matches (abhgupta at redhat.com)
+
+* Mon Apr 08 2013 Adam Miller <admiller at redhat.com> 1.7.2-1
+- Handling case where the user is not present (abhgupta at redhat.com)
+- oo-accept-broker: fix and enable SELinux checks (miciah.masters at gmail.com)
+- Merge pull request #1669 from tdawson/tdawson/minor-spec-cleanup/2013-03-15
+ (dmcphers+openshiftbot at redhat.com)
+- Typo fixes (bleanhar at redhat.com)
+- fixing rebase (tdawson at redhat.com)
+- Adding ability to add and remove domain wide environment variables from admin
+ script (kraman at gmail.com)
+
+* Thu Mar 28 2013 Adam Miller <admiller at redhat.com> 1.7.1-1
+- bump_minor_versions for sprint 26 (admiller at redhat.com)
+
+* Wed Mar 27 2013 Adam Miller <admiller at redhat.com> 1.6.7-1
+- Merge pull request #1789 from brenton/master (dmcphers at redhat.com)
+- Merge pull request #1777 from kraman/remove_oo_scripts
+ (dmcphers+openshiftbot at redhat.com)
+- Removing oo-setup-* scripts as they have been replaced by puppet and ansible
+ modules. Updating puppet setup docs (kraman at gmail.com)
+- Merge remote-tracking branch 'origin/master' into update_to_new_plan_values
+ (ccoleman at redhat.com)
+- Remove references to plans from origin-server (ccoleman at redhat.com)
+- Merge remote-tracking branch 'origin/master' into update_to_new_plan_values
+ (ccoleman at redhat.com)
+- MegaShift => Silver (ccoleman at redhat.com)
+- Adding SESSION_SECRET settings to the broker and console
+ (bleanhar at redhat.com)
+
+* Tue Mar 26 2013 Adam Miller <admiller at redhat.com> 1.6.6-1
+- Fix for bug 927154 Fixing multiple issues in remove-gear command of admin
+ script (abhgupta at redhat.com)
+
+* Mon Mar 25 2013 Adam Miller <admiller at redhat.com> 1.6.5-1
+- Fix for the underlying issue behind bug 924651 (abhgupta at redhat.com)
+- Merge pull request #1768 from rajatchopra/master (dmcphers at redhat.com)
+- handle broken ops, and reset state of ops that failed to clear
+ (rchopra at redhat.com)
+- Fix for bug 924651 (abhgupta at redhat.com)
+
+* Thu Mar 21 2013 Adam Miller <admiller at redhat.com> 1.6.4-1
+- fix BZ923579 - no uuid for user/domain (rchopra at redhat.com)
+- Fix for bug 923176 - Handling missing or empty component_instances -
+ Handling false positives for UID checks for districts (abhgupta at redhat.com)
+- Merge pull request #1708 from brenton/BZ923070
+ (dmcphers+openshiftbot at redhat.com)
+- Merge pull request #1707 from rajatchopra/master
+ (dmcphers+openshiftbot at redhat.com)
+- Bug 923070 - Removing duplicate warning from oo-admin-broker-auth
+ (bleanhar at redhat.com)
+- fix for bug918947, remove gear called on non-existent gear of an app
+ (rchopra at redhat.com)
+- Bug 923070 - removing duplicate mongo call in oo-admin-broker-auth
+ (bleanhar at redhat.com)
+- Merge pull request #1692 from rajatchopra/master
+ (dmcphers+openshiftbot at redhat.com)
+- spec file fixed for analytics utilities (rchopra at redhat.com)
+- analytics data export/import (rchopra at redhat.com)
+- Merge pull request #1679 from abhgupta/abhgupta-dev
+ (dmcphers+openshiftbot at redhat.com)
+- Modifying the man page and usage details for oo-admin-chk
+ (abhgupta at redhat.com)
+
+* Mon Mar 18 2013 Adam Miller <admiller at redhat.com> 1.6.3-1
+- Reporting errors for gears that aren't found (bleanhar at redhat.com)
+- Bug 922678 - Fixing oo-admin-broker-auth's --rekey option
+ (bleanhar at redhat.com)
+- Bug 922677 - Warning if --find-gears can't locate all nodes
+ (bleanhar at redhat.com)
+- Merge pull request #1633 from lnader/revert_pull_request_1486
+ (dmcphers+openshiftbot at redhat.com)
+- Changed private_certificate to private_ssl_certificate (lnader at redhat.com)
+- Add SNI upload support to API (lnader at redhat.com)
+- Improving efficiency of checks and fixing empty gear check Additional fixes
+ for oo-admin-chk (abhgupta at redhat.com)
+- Merge pull request #1660 from rajatchopra/master
+ (dmcphers+openshiftbot at redhat.com)
+- improve clear-pending-ops to handle new failures as shown in prod
+ (rchopra at redhat.com)
+- Adding additional checks to oo-admin-chk script (abhgupta at redhat.com)
+
+* Thu Mar 14 2013 Adam Miller <admiller at redhat.com> 1.6.2-1
+- Merge pull request #1637 from brenton/BZ921257 (dmcphers at redhat.com)
+- Lots of oo-accept-broker fixes (bleanhar at redhat.com)
+- Make packages build/install on F19+ (tdawson at redhat.com)
+- Bug 921257 - Warn users to change the default AUTH_SALT (bleanhar at redhat.com)
+- Merge pull request #1607 from brenton/oo-admin-broker-auth
+ (dmcphers+openshiftbot at redhat.com)
+- Adding oo-admin-broker-auth (bleanhar at redhat.com)
+- fix bug919379 (rchopra at redhat.com)
+
+* Thu Mar 07 2013 Adam Miller <admiller at redhat.com> 1.6.1-1
+- bump_minor_versions for sprint 25 (admiller at redhat.com)
+
+* Thu Mar 07 2013 Troy Dawson <tdawson at redhat.com> - 1.5.12-3
- Fix to make it build/install on F19+
-* Tue Mar 12 2013 Troy Dawson <tdawson at redhat.com> 1.5.12-2
+* Thu Mar 07 2013 Troy Dawson <tdawson at redhat.com> 1.5.12-2
- removed rubygem-mongo dependancy
- Added dependancies
- Cleanup for Fedora standards
diff --git a/sources b/sources
index 399bf26..8adba8b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2573ccce1b8afce9f95b81c5aa398c65 openshift-origin-broker-util-1.5.12.tar.gz
+e9d38c1a324b212b9f5b1d12b564ea0f openshift-origin-broker-util-1.9.7.tar.gz
More information about the scm-commits
mailing list