starlingx/utilities
Code Issues Proposed changes

Merge "debian: Remove postgresql workarounds"

Browse Source
This commit is contained in:
Zuul 2022-05-17 16:51:53 +00:00 committed by Gerrit Code Review
commit 36ee4a8565
1 changed files with 0 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
tools/debian-integration/source-debian/before_bootstrap_workarounds.sh
View File

@ -28,32 +28,6 @@ with open("/etc/resolv.conf", "w") as f:
EOF
sudo python /home/sysadmin/correct_dns.py
# BI 20 e and n:
bifile='/home/sysadmin/.bi20e'
if [ ! -f ${bifile} ]; then
for f in /usr/lib/postgresql/13/bin/*
do
echo "Linked $f"
ln -s "$f" /usr/bin
done
touch ${bifile}
fi
# BI 20 f:
sed -i "s@python-psycopg2@python3-psycopg2@g" /usr/share/puppet/modules/postgresql/manifests/params.pp
# BI 20.o:
bifile='/home/sysadmin/.20o'
if [ ! -f ${bifile} ]; then
sed -i 's@/var/lib/postgresql/%I@/var/lib/postgresql/22.06@g' /lib/systemd/system/postgresql@.service
sed -i 's@/var/lib/postgresql/13/main@/var/lib/postgresql/22.06@g' /etc/postgresql/13/main/postgresql.conf
sed -i 's@ExecStart=-/usr/bin/pg_ctlcluster --skip-systemctl-redirect %i start@ExecStart=-/usr/bin/pg_ctlcluster --skip-systemctl-redirect %i start -- -D /var/lib/postgresql/22.06@g' /lib/systemd/system/postgresql@.service
systemctl daemon-reload
sed -i '86 a \ \ Anchor["postgresql::server::service::end"] ->' /usr/share/puppet/modules/postgresql/manifests/server/role.pp
touch ${bifile}
fi
# BI 25: ignore puppet apply warnings until we fix them
sed -i 's@Warning|@MMAAAAAAAAAASKED|@g' /usr/local/bin/puppet-manifest-apply.sh
@ -66,17 +40,6 @@ if [ ! -f ${bifile} ]; then
touch ${bifile}
fi
# BI 40: workaround located at bootstrap section
# BI 50: postgres configuration issue
sed -i 's@#listen_addresses = '\''localhost'\''@listen_addresses = '\''*'\''@g' /etc/postgresql/13/main/postgresql.conf
echo "host all all 0.0.0.0/0 md5" >> /etc/postgresql/13/main/pg_hba.conf
# ipv6
echo "host all all ::0/0 md5" >> /etc/postgresql/13/main/pg_hba.conf
# BI 38.b: slow rpc calls.
echo "jit = off" >> /etc/postgresql/13/main/postgresql.conf
# Debian ClusterIssuer cert-manager v1 is not currently available for test-issuer during bootstrap
bifile='/home/sysadmin/.cm'
if [ ! -f ${bifile} ]; then