openstack
/
openstack-ansible-lxc_hosts
Code Issues Proposed changes

Fix lxc cache prep resolvers 

Recent changes in the upstream LXC images have resulted in breakage
caused by busted symlinks, likely to the image moving to
"systemd-resolved". This change backports the process we use in master
to create the cache resolvers which will ensure we're not having to deal
with this issue.

Change-Id: I3769053956b958a0ac7cab499ea90af2a40de850
Related-Change: I1775e775bbb7fe86bdffdd8296c2cff5ebc5bac8
Closes-Bug: #1768592
Signed-off-by: Kevin Carter <kevin.carter@rackspace.com>
(cherry picked from commit e77c3a923b)
This commit is contained in:
Kevin Carter 2018-05-02 20:55:04 -05:00 committed by Olivier Bourdon
parent 91924b4ce0
commit 38287280a5
2 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
vars/redhat-7.yml
View File

@ -45,9 +45,7 @@ lxc_cache_map:
cache_prep_commands: |
{{ lxc_cache_prep_pre_commands }}
mkdir -p /etc/ansible/facts.d/
if [ -a /etc/resolv.conf ]; then
mv /etc/resolv.conf /etc/resolv.conf.org
fi
rm /etc/resolv.conf || true
{% for resolver in lxc_cache_prep_dns %}
echo "nameserver {{ resolver }}" >> /etc/resolv.conf
{% endfor %}
@ -61,11 +59,7 @@ lxc_cache_map:
mkdir -p /var/backup
echo -e '{{ lxc_container_default_interfaces }}' | tee /etc/sysconfig/network-scripts/ifcfg-eth0
chage -I -1 -d -1 -m 0 -M 99999 -E -1 root
if [ -a /etc/resolv.conf.org ]; then
mv /etc/resolv.conf.org /etc/resolv.conf
else
rm -f /etc/resolv.conf
fi
echo "nameserver {{ lxc_net_address }}" > /etc/resolv.conf
{{ lxc_cache_prep_post_commands }}
lxc_cache_distro_packages:

10
vars/ubuntu-16.04.yml
View File

@ -56,9 +56,7 @@ lxc_cache_map:
cache_prep_commands: |
{{ lxc_cache_prep_pre_commands }}
mkdir -p /etc/ansible/facts.d/
if [ -a /etc/resolv.conf ]; then
mv /etc/resolv.conf /etc/resolv.conf.org
fi
rm /etc/resolv.conf || true
{% for resolver in lxc_cache_prep_dns %}
echo "nameserver {{ resolver }}" >> /etc/resolv.conf
{% endfor %}
@ -78,11 +76,7 @@ lxc_cache_map:
echo -e '{{ lxc_container_default_interfaces }}' | tee /etc/network/interfaces
mkdir -p /etc/network/interfaces.d
chage -I -1 -d -1 -m 0 -M 99999 -E -1 root
if [ -a /etc/resolv.conf.org ]; then
mv /etc/resolv.conf.org /etc/resolv.conf
else
rm -f /etc/resolv.conf
fi
echo "nameserver {{ lxc_net_address }}" > /etc/resolv.conf
{{ lxc_cache_prep_post_commands }}
# This forces any modified configurations to remain, and any unmodified configs to be replaced