openstack/project-config
Code Issues Proposed changes

Revert "Ensure NetworkManager doesn't override /etc/resolv.conf"

Browse Source 
Bug in the inline Python's indentation levels. Please correct and
resubmit with more testing included where possible.

This reverts commit 368bb77ee3.

Change-Id: I20ed2c48bc223bd13d04c297e877f47c02141e4d
This commit is contained in:
Jeremy Stanley 2022-12-02 13:41:55 +00:00
parent e92af53c10
commit 7a513f0036
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nodepool/elements/nodepool-base/finalise.d/89-boot-settings
View File

@ -159,18 +159,6 @@ set -e
echo 'nameserver 127.0.0.1' > /etc/resolv.conf
EOF
# Configure NetworkManager to not manage /etc/resolv.conf
if [ -d /etc/NetworkManager/conf.d ]; then
cat <<EOF |python3
import configparser
p = configparser.SafeConfigParser()
p.set('main', 'rc-manager', 'unmanaged')
with open('/etc/NetworkManager/conf.d/rc-manager.conf', 'w') as fh:
p.write(fh)
EOF
fi
# openSUSE doesn't have an iptables service, so apply the iptables rules at boot
if [[ "${DISTRO_NAME}" =~ (opensuse) ]] ; then
cat >>$rclocal <<EOF