[aeolus-configure/f16] update to latest aeolus-configure release 2.5.0

[Mo Morsi]

commit 2345d35dfda33815b9cbb7852602f2e72f4fc655
Author: Mo Morsi <mmorsi at redhat.com>
Date:   Mon Feb 27 13:47:56 2012 -0500

    update to latest aeolus-configure release 2.5.0

 .gitignore            |    1 +
 aeolus-configure.spec |   70 ++++++++++++++++++++++++++++++++++++++++++++++---
 sources               |    2 +-
 3 files changed, 68 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 38bd440..9510dd8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /aeolus-configure-2.0.1.tgz
 /aeolus-configure-2.0.2-gitb7ee8da278.tgz
 /aeolus-configure-2.1.0.tgz
+/aeolus-configure-2.5.0.tgz
diff --git a/aeolus-configure.spec b/aeolus-configure.spec
index 503ce24..7fed53e 100644
--- a/aeolus-configure.spec
+++ b/aeolus-configure.spec
@@ -3,8 +3,8 @@
 
 Summary:  Aeolus Configure Puppet Recipe
 Name:     aeolus-configure
-Version:  2.1.0
-Release:  1%{?extra_release}%{?dist}
+Version:  2.5.0
+Release:  4%{?dist}
 
 Group:    Applications/Internet
 License:  ASL 2.0
@@ -47,9 +47,9 @@ Aeolus Configure Puppet Recipe
 %{__cp} -R %{pbuild}/recipes/openssl/ %{buildroot}/%{aeolushome}/modules/openssl
 %{__cp} -R %{pbuild}/recipes/postgres/ %{buildroot}/%{aeolushome}/modules/postgres
 %{__cp} -R %{pbuild}/bin/aeolus-node %{buildroot}/%{aeolushome}/modules/aeolus/
+%{__cp} -R %{pbuild}/bin/aeolus-node-check %{buildroot}/%{aeolushome}/modules/aeolus/
 %{__cp} -R %{pbuild}/bin/aeolus-check-services %{buildroot}/%{_bindir}/
 %{__cp} -R %{pbuild}/bin/aeolus-restart-services %{buildroot}/%{_sbindir}/
-%{__cp} -R %{pbuild}/bin/aeolus-configure-image %{buildroot}/%{_sbindir}/
 %{__cp} -R %{pbuild}/bin/aeolus-configure %{buildroot}/%{_sbindir}/
 %{__cp} -R %{pbuild}/bin/aeolus-cleanup %{buildroot}/%{_sbindir}/
 
@@ -61,9 +61,71 @@ Aeolus Configure Puppet Recipe
 %attr(0755, root, root) %{_bindir}/aeolus-check-services
 %attr(0755, root, root) %{_sbindir}/aeolus-restart-services
 %{aeolushome}
-%{_sbindir}/aeolus-configure-image
 
 %changelog
+* Wed Jan 11 2012 Steve Linabery <slinaber at redhat.com> - 2.5.0-4
+- 5cd7786 BZ#773060 - do not add provider accounts for rhevm, vshpere in aeolus-configure
+- 6f108fc Bump release, add changelog, 2.5.0-3
+
+* Tue Jan 10 2012 Steve Linabery <slinaber at redhat.com> - 2.5.0-3
+- e32ce7e BZ 773037 - update RHEVM configuration to support data centers
+- caf1355 Set version in Rakefile to 2.5.0
+- f1dbbad Set release number
+- cc97b46 Fixing merge conflict
+- e36cfec Correct versioning in changelog entry
+- bcbbde2 Revert version bump
+- 4dbabc3 Bump version, reset release
+- fdce4e6 Bump release, add changelog
+
+* Mon Jan 09 2012 Steve Linabery <slinaber at redhat.com> - 2.5.0-2
+- f0043e8 Remove extra_release from spec.in
+- c4d94bf Bump release
+- 97295c9 Bring in changelog from 2.5.0 release specfile
+- 196b80d BZ#766661 - more ec2 provider errors with aeolus-configure
+- 6956414 BZ#766697 - running configure -p rhevm without updating rhevm config needs better error msg
+
+* Wed Jan 04 2012 Steve Linabery <slinaber at redhat.com> - 2.5.0-1
+- 17b704a Changes to build behavior in rpmtask.rb, Rakefile
+- d030803 BZ #766661 - provide mechanism to log aeolus-configure web requests, responses, and errors
+- d3ed726 BZ 746702 - Check node config files are in correct format before executing puppet - v3
+- 5f58c68 BZ#740089: fix wording in interactive installer (rev2)
+- 83993ba BZ 725596 - umount rhev export only if it is not in use
+- 3d8c09b BZ 731863 - option to disable select components
+- 87b9402 BZ 731863 - add --savedata (-s) option to aeolus-cleanup
+- 161eb91 BZ# 768131: Configure should set owner of pg_hba.conf to postgres
+- 3b61da5 BZ# 768123: Configure should not write /root/.aeolus-cli
+- 990f43d added usage to aeolus-restart-services
+- 05360db added usage to aeolus-check-services
+- 876df0d BZ #761447: aeolus-configure-image returns (LoadError).
+- 384600b Rename mock account from mockuser to mock
+- aeeb579 Changed iwhd user.js mode to 600
+- 4da2686 iwhd rest.c requires the users.js mode to be 700
+- 8c7b96e BZ 758473 - aeolus-configure should check RHEVM export directory has correct type
+- fd42729 RM 2879 - Fix adding provider accounts through aeolus-configure
+- 78bebcc Remove relp dependency, this should be tracked in aeolus-all metapackage instead.
+- 387f161 Bump version for ongoing development on master branch
+- da3d340 Bump release and add changelog for 2.4.0 RC
+
+* Thu Dec  1 2011 Steve Linabery <slinaber at redhat.com> - 2.4.0-1
+- ffc966c Regenerate conductor secret_token.rb file each time configure is executed
+- 4dfb1c3 Bump the version of aeolus-cli to 0.2.0
+- d8e6c40 Fix the collision in the /conductor/images/ path
+- fc84050 Log the image warehouse cleanup output
+- 1337d60 Redmine #2807 - Add ability to flush out iwhd in aeolus-cleaup
+- de3c009 Bump version following release of 2.3.0-1 on 2.3.x branch
+- fa3f661 BZ753258 - aeolus-configure overwrites contents in /etc/imagefactory/imagefactory.conf every time its executed
+- 43ad235 Ensure logout is called after all provider adds in ec2 profile.
+- f365b00 BZ752975 - multiple executions of aeolus-cleanup/configure not working as expected
+- 2b67daf Fix for Redmine #2680
+- 32f555a Document how to specify multiple profiles in aeolus-configure -h.
+- 7a0e110 Clean up rsyslog config file
+- dc67269 BZ 753273 - rsyslog configuration causes messages log to grow rapidly.
+- 0087203 BZ 753250: - aeolus-configure fails No such file or directory
+- 0af7031 update aeolus check/restart services scripts for f16 (jlaska's fix for BZ #747762 rebased)
+
+* Thu Nov 17 2011 Steve Linabery <slinaber at redhat.com> - 2.4.0-0
+- Bump version following release of 2.3.0-1 from 2.3.x branch
+
 * Wed Sep 14 2011 Richard Su <rwsu at redhat.com> 2.0.2-4
 - single deltacloud-core
 - rhevm and vsphere configurations moved to their own profiles
diff --git a/sources b/sources
index dc7cca1..fcfcd57 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0269e0ad8c98c2329a65eda2a8d3db1a  aeolus-configure-2.1.0.tgz
+d2195db5137897018b0ad30adc1b2980  aeolus-configure-2.5.0.tgz