Merge pull request #30077 from CodeJuan/master

Automatic merge from submit-queue

fixed regex error, which replace 2 line in template file

fixes #30074
This commit is contained in:
Kubernetes Submit Queue
2016-08-04 16:26:02 -07:00
committed by GitHub

View File

@@ -29,7 +29,7 @@ while read -ra LINE; do
sed -i -e "s|^bind.*$|bind ${LINE}|" ${CFG}
elif [ "$(/opt/redis/redis-cli -h $LINE info | grep role | sed 's,\r$,,')" = "role:master" ]; then
# TODO: More restrictive regex?
sed -i -e "s|^.*slaveof.*$|slaveof ${LINE} ${PORT}|" ${CFG}
sed -i -e "s|^# slaveof.*$|slaveof ${LINE} ${PORT}|" ${CFG}
fi
done