Merge "Remove debug config of unbound since it's enabled"

This commit is contained in:
Zuul 2017-12-05 21:49:46 +00:00 committed by Gerrit Code Review
commit 2f6a036f2b
3 changed files with 0 additions and 15 deletions

View File

@ -11,11 +11,6 @@ if [ -f "$TRIPLEO_ROOT/tripleo-ci/deploy.env" ]; then
source $TRIPLEO_ROOT/tripleo-ci/deploy.env
fi
if [[ -e /etc/unbound/conf.d/unbound-logging.conf ]]; then
sudo sed -i "s/verbosity: .*$/verbosity: 5/g" /etc/unbound/conf.d/unbound-logging.conf
sudo systemctl restart unbound
fi
# Ensure epel-release is not installed
sudo yum erase -y epel-release || :

View File

@ -11,11 +11,6 @@ if [ -f "$TRIPLEO_ROOT/tripleo-ci/deploy.env" ]; then
source $TRIPLEO_ROOT/tripleo-ci/deploy.env
fi
if [[ -e /etc/unbound/conf.d/unbound-logging.conf ]]; then
sudo sed -i "s/verbosity: .*$/verbosity: 5/g" /etc/unbound/conf.d/unbound-logging.conf
sudo systemctl restart unbound
fi
# Ensure epel-release is not installed
sudo yum erase -y epel-release || :

View File

@ -7,11 +7,6 @@ set -eux
export START_JOB_TIME=$(date +%s)
export PS4='+(${BASH_SOURCE}:${LINENO}): ${FUNCNAME[0]:+${FUNCNAME[0]}(): }'
if [[ -e /etc/unbound/conf.d/unbound-logging.conf ]]; then
sudo sed -i "s/verbosity: .*$/verbosity: 5/g" /etc/unbound/conf.d/unbound-logging.conf
sudo systemctl restart unbound
fi
# Maintain compatibility with the old jobtypes
if [[ ! $TOCI_JOBTYPE =~ "featureset" ]]; then
echo "WARNING: USING OLD DEPLOYMENT METHOD. THE OLD DEPLOYMENT METHOD THAT USES tripleo.sh WILL BE DEPRECATED IN THE QUEENS CYCLE"