openstack/octavia
Code Issues Proposed changes

Merge "Workaround to fix amphora-agent on centos"

Browse Source
This commit is contained in:
Zuul 2021-11-15 16:07:58 +00:00 committed by Gerrit Code Review
commit 74f3242c8e
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
elements/amphora-agent/static/etc/NetworkManager/conf.d/dns-none.conf Normal file
View File

@ -0,0 +1,4 @@
[main]
# Set dns to none, it prevents NetworkManager to update the /etc/resolv.conf
# file.
dns=none

7
elements/no-resolvconf/finalise.d/99-disable-resolv-conf
View File

@ -1,6 +1,9 @@
#!/bin/bash #!/bin/bash
echo "" > /etc/resolv.conf
echo "" > /etc/resolv.conf.ORIG # Override resolv.conf file from DIB with a custom one.
# Having at least one nameserver is now required by dnfpython (>=)
echo "nameserver 127.0.0.1" > /etc/resolv.conf
echo "nameserver 127.0.0.1" > /etc/resolv.conf.ORIG
if [ -d /etc/dhcp/dhclient-enter-hooks.d ] if [ -d /etc/dhcp/dhclient-enter-hooks.d ]
then then
# Debian/Ubuntu # Debian/Ubuntu