opendev/system-config
Code Issues Proposed changes

Merge "Turn off color in module install"

Browse Source
This commit is contained in:
Jenkins 2014-12-12 16:59:02 +00:00 committed by Gerrit Code Review
commit c49fb5a0e3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
install_modules.sh
View File

@ -65,7 +65,7 @@ if [ -z "${!MODULES[*]}" ] && [ -z "${!SOURCE_MODULES[*]}" ] ; then
exit 0 exit 0
fi fi
MODULE_LIST=`puppet module list` MODULE_LIST=`puppet module list --color=false`
# Transition away from old things # Transition away from old things
if [ -d /etc/puppet/modules/vcsrepo/.git ]; then if [ -d /etc/puppet/modules/vcsrepo/.git ]; then
@ -77,9 +77,9 @@ for MOD in ${!MODULES[*]} ; do
# If the module at the current version does not exist upgrade or install it. # If the module at the current version does not exist upgrade or install it.
if ! echo $MODULE_LIST | grep "$MOD ([^v]*v${MODULES[$MOD]}" >/dev/null 2>&1 ; then if ! echo $MODULE_LIST | grep "$MOD ([^v]*v${MODULES[$MOD]}" >/dev/null 2>&1 ; then
# Attempt module upgrade. If that fails try installing the module. # Attempt module upgrade. If that fails try installing the module.
if ! puppet module upgrade $MOD --version ${MODULES[$MOD]} >/dev/null 2>&1 ; then if ! puppet module upgrade $MOD --color=false --version ${MODULES[$MOD]} >/dev/null 2>&1 ; then
# This will get run in cron, so silence non-error output # This will get run in cron, so silence non-error output
puppet module install $MOD --version ${MODULES[$MOD]} >/dev/null puppet module install $MOD --color=false --version ${MODULES[$MOD]} >/dev/null
fi fi
fi fi
done done