From: Martyn Taylor mtaylor@redhat.com
--- bin/aeolus-configure | 27 ++++++++++++++++++++++++++- 1 files changed, 26 insertions(+), 1 deletions(-)
diff --git a/bin/aeolus-configure b/bin/aeolus-configure index 877b62b..10515e1 100644 --- a/bin/aeolus-configure +++ b/bin/aeolus-configure @@ -1,4 +1,28 @@ #!/bin/sh +usage() +{ +cat << EOF + +USAGE: +aeolus-configure [-d|--debug] [-h|--help] [-v|--verbose] + +OPTIONS: + -h | --help Show this message. + -d | --debug Debug loggin mode + -v | --verbose Verbose logging mode +EOF +} + +eval set -- `getopt -o hdv --long help,debug,verbose -- "$@"` +while true ; do + case "$1" in + -h|--help) usage ; exit 1 ; shift ;; + -d|--debug) LOGLEVEL="--debug" ; shift ;; + -v|--verbose) LOGLEVEL="--verbose" ; shift ;; + --) shift ; break ;; + *) usage ; exit 1 ;; + esac +done
export FACTER_AEOLUS_ENABLE_HTTPS=true export FACTER_AEOLUS_ENABLE_SECURITY=false @@ -6,5 +30,6 @@ puppet /usr/share/aeolus-configure/modules/aeolus/manifests/defaults.pp \ --modulepath=/usr/share/aeolus-configure/modules/ \ --external_nodes '/usr/sbin/aeolus-node configure' --node_terminus exec \ --logdest=/var/log/aeolus-configure/aeolus-configure.log \ - --logdest=console + --logdest=console \ + $LOGLEVEL
From: Martyn Taylor mtaylor@redhat.com
--- recipes/aeolus/manifests/conductor.pp | 1 + recipes/aeolus/manifests/rails.pp | 1 + 2 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/recipes/aeolus/manifests/conductor.pp b/recipes/aeolus/manifests/conductor.pp index b3dc3aa..db356f6 100644 --- a/recipes/aeolus/manifests/conductor.pp +++ b/recipes/aeolus/manifests/conductor.pp @@ -110,6 +110,7 @@ class aeolus::conductor inherits aeolus { cwd => '/usr/share/aeolus-conductor', environment => "RAILS_ENV=production", command => "/usr/bin/rake dc:prepare_repos", + logoutput => on_failure, require => Package['aeolus-conductor'] }
diff --git a/recipes/aeolus/manifests/rails.pp b/recipes/aeolus/manifests/rails.pp index 5586a8d..2b9e571 100644 --- a/recipes/aeolus/manifests/rails.pp +++ b/recipes/aeolus/manifests/rails.pp @@ -13,6 +13,7 @@ define rails::migrate::db($cwd="", $rails_env=""){ exec{"migrate_rails_database": cwd => $cwd, environment => "RAILS_ENV=${rails_env}", + logoutput => on_failure, command => "/usr/bin/rake db:migrate"} }
On 31/05/2011, at 3:24 AM, mtaylor@redhat.com wrote:
From: Martyn Taylor mtaylor@redhat.com
bin/aeolus-configure | 27 ++++++++++++++++++++++++++- 1 files changed, 26 insertions(+), 1 deletions(-)
diff --git a/bin/aeolus-configure b/bin/aeolus-configure index 877b62b..10515e1 100644 --- a/bin/aeolus-configure +++ b/bin/aeolus-configure @@ -1,4 +1,28 @@ #!/bin/sh +usage() +{ +cat << EOF
+USAGE: +aeolus-configure [-d|--debug] [-h|--help] [-v|--verbose]
+OPTIONS:
- -h | --help Show this message.
- -d | --debug Debug loggin mode
Typo, missing a 'g'.
Didn't review the rest of the patch, was just scanning emails.
Having good logging available for configure/cleanup is definitely worthwhile though. :)
Regards and best wishes,
Justin Clift
-- Aeolus Community Manager http://www.aeolusproject.org
aeolus-devel@lists.fedorahosted.org
-
Justin Clift -
Martyn Taylor