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>
This commit is contained in:
Kevin Carter 2018-05-02 20:55:04 -05:00 committed by Kevin Carter (cloudnull)
parent 0cf0e283db
commit e77c3a923b
3 changed files with 6 additions and 24 deletions

View File

@ -58,9 +58,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 %}
@ -84,11 +82,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:

View File

@ -50,9 +50,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 %}
@ -70,11 +68,7 @@ lxc_cache_map:
mkdir -p /var/backup
echo -e '{{ lxc_container_default_interfaces }}' | tee /etc/sysconfig/network/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
# NOTE(hwoarang): Enable sshd which has been explicitely disabled in
# https://github.com/lxc/lxc-ci/commit/8dc7105399350a59698538a12b6d5a1a880ef2ba
systemctl -q unmask sshd

View File

@ -64,9 +64,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 %}
@ -91,11 +89,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