openstack
/
octavia
Code Issues Proposed changes

Merge "Fix dhclient enter hook path on RHEL-based amps"

This commit is contained in:
Zuul 2019-07-16 05:31:40 +00:00 committed by Gerrit Code Review
parent 5114a9a4f9 6c0756864f
commit 5f38432c2f
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,8 +11,8 @@ make_resolv_conf() { : ; }" > /etc/dhcp/dhclient-enter-hooks.d/noresolvconf
else
# RHEL/CentOS/Fedora
echo "#!/bin/sh
make_resolv_conf() { : ; }" > /etc/dhclient-enter-hooks
chmod +x /etc/dhclient-enter-hooks
make_resolv_conf() { : ; }" > /etc/dhcp/dhclient-enter-hooks
chmod +x /etc/dhcp/dhclient-enter-hooks
fi
if [ -e /etc/nsswitch.conf ]; then

5
releasenotes/notes/fix-no-resolvconf-rhel-dhclient-hook-36a1c3b1a3b03a3d.yaml Normal file
View File

@ -0,0 +1,5 @@
---
fixes:
- |
Fixed an issue where /etc/resolv.conf on RHEl-based amphorae was being
populated with DNS servers.