Remove color output from puppet apply
This help when reading log files from nodepool. Otherwise we see the following in the log files: [1;31mWarning: Config file /etc/puppet/hiera.yaml not found, using Hiera defaults[0m Change-Id: I3a865e5107e2749ed44c144539af49e311e0125f Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
parent
bc72d35646
commit
ebdd2553d0
@ -49,7 +49,9 @@ EOF
|
||||
# Use detailed exit codes to get that info and determine whether
|
||||
# the return code indicates failure.
|
||||
set +e
|
||||
puppet apply --detailed-exitcodes --modulepath=/opt/build_git/openstack-infra/system-config/modules:/etc/puppet/modules /tmp/local.pp
|
||||
puppet apply --detailed-exitcodes --color=false \
|
||||
--modulepath=/opt/build_git/openstack-infra/system-config/modules:/etc/puppet/modules \
|
||||
/tmp/local.pp
|
||||
PUPPET_RETURN=$?
|
||||
if [ "$PUPPET_RETURN" -eq 4 ] || [ "$PUPPET_RETURN" -eq 6 ] ; then
|
||||
exit $PUPPET_RETURN
|
||||
|
@ -108,7 +108,8 @@ sudo /bin/bash /root/system-config/install_modules.sh
|
||||
|
||||
set +e
|
||||
if [ -z "$NODEPOOL_SSH_KEY" ] ; then
|
||||
sudo puppet apply --detailed-exitcodes --modulepath=/root/system-config/modules:/etc/puppet/modules \
|
||||
sudo puppet apply --detailed-exitcodes --color=false \
|
||||
--modulepath=/root/system-config/modules:/etc/puppet/modules \
|
||||
-e "class {'openstack_project::single_use_slave':
|
||||
sudo => $SUDO,
|
||||
thin => $THIN,
|
||||
@ -116,7 +117,8 @@ if [ -z "$NODEPOOL_SSH_KEY" ] ; then
|
||||
}"
|
||||
PUPPET_RET_CODE=$?
|
||||
else
|
||||
sudo puppet apply --detailed-exitcodes --modulepath=/root/system-config/modules:/etc/puppet/modules \
|
||||
sudo puppet apply --detailed-exitcodes --color=false \
|
||||
--modulepath=/root/system-config/modules:/etc/puppet/modules \
|
||||
-e "class {'openstack_project::single_use_slave':
|
||||
install_users => false,
|
||||
sudo => $SUDO,
|
||||
|
Loading…
Reference in New Issue
Block a user