From 3cc3be852ee9b57791a4942d8131fcfb5c0643be Mon Sep 17 00:00:00 2001 From: Steve Linabery Date: Fri, 8 Jun 2012 12:06:05 -0500 Subject: [PATCH 1/2] update to latest aeolus-configure release 2.6.0 --- .gitignore | 1 + aeolus-configure.spec | 133 ++++++++++++++++++++++++++++++++++++++++-- sources | 2 +- 3 files changed, 129 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 38bd440..9efb3d9 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.6.0.tgz diff --git a/aeolus-configure.spec b/aeolus-configure.spec index 11218e6..5296dc5 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: 2%{?extra_release}%{?dist} +Version: 2.6.0 +Release: 1%{?dist} Group: Applications/Internet License: ASL 2.0 @@ -36,6 +36,7 @@ Aeolus Configure Puppet Recipe %build %install +%{__mkdir} -p %{buildroot}/%{_mandir}/man1 %{__mkdir} -p %{buildroot}/%{aeolushome}/modules/aeolus %{buildroot}/%{_sbindir} %{__mkdir} -p %{buildroot}/%{_bindir} %{__mkdir} -p %{buildroot}%{_sysconfdir}/aeolus-configure/nodes @@ -47,25 +48,145 @@ 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-services %{buildroot}/%{_sbindir}/ %{__cp} -R %{pbuild}/bin/aeolus-configure %{buildroot}/%{_sbindir}/ %{__cp} -R %{pbuild}/bin/aeolus-cleanup %{buildroot}/%{_sbindir}/ +%{__cp} %{pbuild}/docs/man1/* %{buildroot}/%{_mandir}/man1/ %files %doc COPYING %attr(0755, root, root) %{_sbindir}/aeolus-configure %attr(0755, root, root) %{_sbindir}/aeolus-cleanup %config(noreplace) %{_sysconfdir}/aeolus-configure/* +%attr(0600, root, root) %{_sysconfdir}/aeolus-configure/nodes/* %attr(0755, root, root) %{_bindir}/aeolus-check-services %attr(0755, root, root) %{_sbindir}/aeolus-restart-services +%attr(0755, root, root) %{_sbindir}/aeolus-services +%doc %{_mandir}/man1/* %{aeolushome} -%{_sbindir}/aeolus-configure-image %changelog -* Thu Jan 12 2012 Fedora Release Engineering - 2.1.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild +* Wed Jun 06 2012 Steve Linabery - 2.6.0-1 +- 338b0ab Add man page for aeolus-services executable +- 5059400 Fix broken string interpolation +- 043873a Fix module structure for puppet 2.7 autoloader +- aab5f1f Use postgres gem if available +- 4909706 Remove test references to 'dutils' +- 0782c8c Fix LOAD_PATH issues with Ruby 1.9 +- 4d00f3c Use RSpec 2.x +- 4f2bf64 BZ827562 - Upgrade from CloudForms 1.0 to CloudForms 1.0.1 requires additional data definition not provided by rails migration +- 9bffb2c BZ 806001 aeolus-configure will always create an admin user, need to key of a uuid not name +- 258d5c4 RM3172 Allow standalone imagefactory/iwhd installation +- f1b6349 RM 3181 - delayed_job support - rev 2 +- 92b67a1 BZ799814: added basic validations for aeolus-configure +- e0e36a4 BZ811373 - Add KeepAlive on to vhost in conductor.conf +- 9de4f42 BZ 803745 - Warn credentials are incorrect if authentication with RHEV fails when checking export type +- 8ac8e2a BZ 803249 - Remove qpidd from configure +- 0a6ef1c BZ 802847 - cleanup hardware profiles and fix provider ordering effects +- 45d5fcf BZ #802871: added man pages for configure executables +- 6f93654 BZ 800057 - aeolus-cleanup should purge aeolus related files in /var/tmp/ +- b7e485e BZ 794505: lower cost hwp for ec2 +- bfa5682 BZ 795935 - put back username and password for conf/vsphere_configure +- 415e5b9 BZ 795935 - remove username from rhevm.json +- cd61e61 BZ 798440 - /etc/aeolus-configure/nodes/* should be not be world readable +- 7bb4220 BZ #796797: Fix Role string for sql statement +- 2c1404a BZ 795935 - Remove passwords from /etc/imagefactory/.json files +- 16e7891 BZ 788644 - remove confusing comments in cleanup config files +- b69c475 BZ 794755 - Static assets don't set Cache-Control headers https://bugzilla.redhat.com/show_bug.cgi?id=794755 +- ac99a8b BZ 788644 - multiple RHEV providers with aeolus_cleanup +- 2491bed BZ 788397 - /var/lib/iwhd should not be removed to maintain consistency with mongodb +- 6a3edf2 BZ #783220 - change default admin email to 'root@localhost' (rev 2) +- aed1ae8 BZ 746702 - Update the error message displayed when there is a problem with a config file +- c5319e5 BZ 785217 - check provider add success by inspecting the flash image alt text +- 421c61a BZ #784833. -d param is positionally dependent +- 2037e2e bz784978 - aeolus-configure is not properly settting the /etc/imagefactory/$provider.json file +- 45d83b0 Revert "Merge branch 'tito' into 1.0-staging" +- 686548f Revert "Automatic commit of package [aeolus-configure] release [2.5.0-8]." +- 0c38ed2 Automatic commit of package [aeolus-configure] release [2.5.0-8]. +- 693ec0e bz784915 - aeolus-configure names vsphere provider "default", change to "vsphere-default" +- f4bc0a0 BZ 773347 - rename redhat.com to example.org +- ce58124 BZ 773347 - add a note in rhevm_configure on how to find the data center id +- 2c51676 Add releasers.conf with rhel dist-git releaser +- 63bf8b0 Fix suffix on source package (.tgz -> tar.gz) +- cff05ca Remove aeolus-configure.spec.in and copy current spec from dist-git +- 3892c74 Initialized to use tito. +- 9af3e7a BZ 783373 - Execute all provider configurations even if there are failures +- f543542 shebang comments are not valid JSON, so remove them +- 82c37d9 Update rhevm and vsphere to support multiple configured providers +- 3c693ce Use YAML format for parameterized classes +- c4934bb Pull in create_resources function from puppet 2.7 tree +- 0a90405 BZ 782210 - improved RHEV NFS export validation +- c8a13c3 BZ # 741947. RFE: add support for all ec2 regions +- c32189f BZ# 771922: set owner,group,mode on conductor settings file +- 814ae5e BZ #740089: remove interactive mode for the time being +- 152dc36 BZ# 769526 - handle invalid blank cloud provider entries +- 8f05269 BZ #771305 - fixes error found when using custom profiles +- a996371 BZ 758644 (part 2) - decrement login counter after aeolus-configure script +- 30407db BZ 758644 (part 1) - clean old cookies when doing a web request +- 8507b70 BZ 746702 - improve whitepace checking in /etc/aeolus-configure/nodes configs +- 8701011 BZ#773060 - do not add provider accounts for rhevm, vshpere in aeolus-configure +- f3d033e BZ 773037 - update RHEVM configuration to support data centers +- 3242d07 Revert "Set version in Rakefile to 2.5.0" +- eea582d Set version in Rakefile to 2.5.0 +- e36cfec Correct versioning in changelog entry +- bcbbde2 Revert version bump +- 4dbabc3 Bump version, reset release +- fdce4e6 Bump release, add changelog + +* Fri Mar 16 2012 Mo Morsi - 2.5.0-3 +- include man pages + +* Mon Jan 09 2012 Steve Linabery - 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 - 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 - 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 - 2.4.0-0 +- Bump version following release of 2.3.0-1 from 2.3.x branch * Wed Sep 14 2011 Richard Su 2.0.2-4 - single deltacloud-core diff --git a/sources b/sources index dc7cca1..503c529 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0269e0ad8c98c2329a65eda2a8d3db1a aeolus-configure-2.1.0.tgz +2ac746dd835a74c64521674d5673d421 aeolus-configure-2.6.0.tgz From fa789cb189f874e6363b35c187fd9fac20ef78da Mon Sep 17 00:00:00 2001 From: Steve Linabery Date: Fri, 29 Jun 2012 13:38:31 -0500 Subject: [PATCH 2/2] import upstream v2.6.1-1 --- .gitignore | 1 + aeolus-configure.spec | 7 ++++++- sources | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9efb3d9..89fd0d3 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /aeolus-configure-2.0.2-gitb7ee8da278.tgz /aeolus-configure-2.1.0.tgz /aeolus-configure-2.6.0.tgz +/aeolus-configure-2.6.1.tgz diff --git a/aeolus-configure.spec b/aeolus-configure.spec index 5296dc5..b0e01d8 100644 --- a/aeolus-configure.spec +++ b/aeolus-configure.spec @@ -3,7 +3,7 @@ Summary: Aeolus Configure Puppet Recipe Name: aeolus-configure -Version: 2.6.0 +Version: 2.6.1 Release: 1%{?dist} Group: Applications/Internet @@ -69,6 +69,11 @@ Aeolus Configure Puppet Recipe %{aeolushome} %changelog +* Fri Jun 29 2012 Steve Linabery - 2.6.1-1 +- 3383586 BZ835151 configure errors after upgrade +- ed28199 BZ#806001 - Remove admin profile +- f7597a7 BZ#806001 - Remove admin profile + * Wed Jun 06 2012 Steve Linabery - 2.6.0-1 - 338b0ab Add man page for aeolus-services executable - 5059400 Fix broken string interpolation diff --git a/sources b/sources index 503c529..d22bc6c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2ac746dd835a74c64521674d5673d421 aeolus-configure-2.6.0.tgz +e04fb7b6d38598f7073c71dfb837dd4a aeolus-configure-2.6.1.tgz