[openshift-origin-msg-node-mcollective] update to version 1.2.5

[tdawson]

commit 7751b0a6e4a31f704090ab47d46b5b019e0426cd
Author: Troy Dawson <tdawson at redhat.com>
Date:   Wed Dec 19 14:42:31 2012 -0600

    update to version 1.2.5

 .gitignore                                 |    1 +
 openshift-origin-msg-node-mcollective.spec |   51 +++++++++++++++++++++------
 sources                                    |    2 +-
 3 files changed, 41 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 58eaf8b..617ec05 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /openshift-origin-msg-node-mcollective-0.1.1.tar.gz
 /openshift-origin-msg-node-mcollective-1.1.4.tar.gz
+/openshift-origin-msg-node-mcollective-1.2.5.tar.gz
diff --git a/openshift-origin-msg-node-mcollective.spec b/openshift-origin-msg-node-mcollective.spec
index c529f3a..6f1a92e 100644
--- a/openshift-origin-msg-node-mcollective.spec
+++ b/openshift-origin-msg-node-mcollective.spec
@@ -4,15 +4,17 @@
 %endif
 %if 0%{?fedora}
     %global vendor_ruby /usr/share/ruby/vendor_ruby/
+    %global mco_agent_root /usr/libexec/mcollective/mcollective/agent/
 %endif
 %if 0%{?rhel}
     %global vendor_ruby /opt/rh/ruby193/root/usr/share/ruby/vendor_ruby/
+    %global mco_agent_root /opt/rh/ruby193/root/usr/libexec/mcollective/mcollective/agent/
 %endif
 
 Summary:        M-Collective agent file for openshift-origin-msg-node-mcollective
 Name:           openshift-origin-msg-node-mcollective
-Version:        1.1.4
-Release:        2%{?dist}
+Version: 1.2.5
+Release:        1%{?dist}
 Group:          Development/Languages
 License:        ASL 2.0
 URL:            http://openshift.redhat.com
@@ -24,9 +26,9 @@ Requires:       rubygem-openshift-origin-node
 Requires:       mcollective
 Requires:       facter
 %if 0%{?fedora}%{?rhel} <= 6
-Requires:       %{?scl:%scl_prefix}mcollective-common
 Requires:       %{?scl:%scl_prefix}facter
 %endif
+Requires:       openshift-origin-msg-common
 BuildArch:      noarch
 Obsoletes:      openshift-mcollective-agent
 
@@ -39,20 +41,18 @@ mcollective communication plugin
 %build
 
 %install
-mkdir -p %{buildroot}/usr/libexec/mcollective/mcollective/agent
+mkdir -p %{buildroot}%{mco_agent_root}
 mkdir -p %{buildroot}%{vendor_ruby}facter
 mkdir -p %{buildroot}/etc/cron.minutely
 mkdir -p %{buildroot}/usr/libexec/mcollective
 
-cp -p src/openshift.rb %{buildroot}/usr/libexec/mcollective/mcollective/agent/
-cp -p src/openshift.ddl %{buildroot}/usr/libexec/mcollective/mcollective/agent/
-cp -p facts/openshift_facts.rb %{buildroot}%{vendor_ruby}facter
+cp -p src/openshift.rb %{buildroot}%{mco_agent_root}
+cp -p facts/openshift_facts.rb %{buildroot}%{vendor_ruby}facter/
 cp -p facts/openshift-facts %{buildroot}/etc/cron.minutely/
 cp -p facts/update_yaml.rb %{buildroot}/usr/libexec/mcollective/
 
 %files
-/usr/libexec/mcollective/mcollective/agent/openshift.rb
-/usr/libexec/mcollective/mcollective/agent/openshift.ddl
+%{mco_agent_root}openshift.rb
 %{vendor_ruby}facter/openshift_facts.rb
 %attr(0700,-,-) /usr/libexec/mcollective/update_yaml.rb
 %attr(0700,-,-) /etc/cron.minutely/openshift-facts
@@ -60,11 +60,38 @@ cp -p facts/update_yaml.rb %{buildroot}/usr/libexec/mcollective/
 
 
 %changelog
-* Fri Nov 30 2012 Troy Dawson <tdawson at redhat.com> 1.1.4-2
-- Removed spec clutter for building on rhel5
+* Tue Dec 11 2012 Adam Miller <admiller at redhat.com> 1.2.5-1
+- Merge pull request #1052 from rmillner/BZ877321 (openshift+bot at redhat.com)
+- Add username to filter list. (rmillner at redhat.com)
+- Hide the password in mcollective logs. (rmillner at redhat.com)
 
-* Mon Nov 26 2012 Adam Miller <admiller at redhat.com> 1.1.4-1
+* Mon Dec 10 2012 Adam Miller <admiller at redhat.com> 1.2.4-1
+- Proper host name validation. (rmillner at redhat.com)
+
+* Tue Dec 04 2012 Adam Miller <admiller at redhat.com> 1.2.3-1
+- Security - Fix the full path to restorecon it was causing errors in the logs
+  (tkramer at redhat.com)
+- more mco 2.2 changes (dmcphers at redhat.com)
+- repacking for mco 2.2 (dmcphers at redhat.com)
+- Refactor tidy into the node library (ironcladlou at gmail.com)
+- Merge pull request #1002 from tdawson/tdawson/fed-update/msg-node-
+  mcollective-1.1.4 (openshift+bot at redhat.com)
+- Move add/remove alias to the node API. (rmillner at redhat.com)
+- Removed spec clutter for building on rhel5 (tdawson at redhat.com)
+- mco value passing cleanup (dmcphers at redhat.com)
+
+* Thu Nov 29 2012 Adam Miller <admiller at redhat.com> 1.2.2-1
+- add any validator for mco 2.2 (dmcphers at redhat.com)
+- Various mcollective changes getting ready for 2.2 (dmcphers at redhat.com)
+- Move force-stop into the the node library (ironcladlou at gmail.com)
+- add backtraces to error conditions in agent (dmcphers at redhat.com)
 - Changing same uid move to rsync (dmcphers at redhat.com)
+- use /bin/env for cron (dmcphers at redhat.com)
+- add oo-ruby (dmcphers at redhat.com)
+- Add method to get the active gears (dmcphers at redhat.com)
+
+* Sat Nov 17 2012 Adam Miller <admiller at redhat.com> 1.2.1-1
+- bump_minor_versions for sprint 21 (admiller at redhat.com)
 
 * Fri Nov 16 2012 Adam Miller <admiller at redhat.com> 1.1.3-1
 - BZ 876942: Disable threading until we can explore proper concurrency
diff --git a/sources b/sources
index 6f04b55..f30ad71 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f6946d999874894903a32ab3269dc2f2  openshift-origin-msg-node-mcollective-1.1.4.tar.gz
+72e90101a8c3453c81194a5e7558b857  openshift-origin-msg-node-mcollective-1.2.5.tar.gz