* debian/tests/acceptance: Fix DCS check for zookeeper in case etcd-server is

installed as well.
This commit is contained in:
Michael Banck 2019-02-04 14:48:05 +01:00
parent faea09fd0d
commit 88f6008c75
2 changed files with 4 additions and 2 deletions

4
debian/changelog vendored
View file

@ -1,6 +1,8 @@
patroni (1.5.4-6) UNRELEASED; urgency=medium
*
[ Michael Banck ]
* debian/tests/acceptance: Fix DCS check for zookeeper in case etcd-server is
installed as well.
-- Debian PostgreSQL Maintainers <team+postgresql@tracker.debian.org> Mon, 04 Feb 2019 12:15:43 +0100

View file

@ -15,7 +15,7 @@ then
SU='su postgres -p -c'
# zookeeper must be started manually (as root)
if ! [ -x /usr/bin/etcd ] && [ -x /etc/init.d/zookeeper ]; then
if [ "$DCS" = "zookeeper" ]; then
# JAVA_OPTS need to be set, otherwise zookeeper is not reachable via IPV4
sed -i -e 's/#JAVA_OPTS=""/JAVA_OPTS="-Djava.net.preferIPv4Stack=true"/' /etc/default/zookeeper
/etc/init.d/zookeeper start