openstack
/
openstack-ansible-lxc_hosts
Code Issues Proposed changes

Merge "move listchanges removal to where it's needed"

This commit is contained in:
Zuul 2020-08-04 18:17:03 +00:00 committed by Gerrit Code Review
parent c94eccc383 2aa1a6776a
commit c21fcdb583
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
templates/prep-scripts/debian_prep.sh.j2
View File

@ -6,6 +6,9 @@ set -e -x
{% include 'templates/prep-scripts/_container_sys_setup.sh.j2' %}
# remove configs that break containers (listchanges is missing)
rm -f /etc/apt/apt.conf.d/20listchanges
export DEBIAN_FRONTEND=noninteractive
apt-get remove -y --purge snap* lxc* lxd* resolvconf* || true
@ -21,7 +24,6 @@ apt-get install -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--fo
apt-get upgrade -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" --force-yes
apt-get remove -y --purge mariadb* || true
rm -f /etc/apt/apt.conf.d/20listchanges
rm /etc/machine-id || true
rm /var/lib/dbus/machine-id || true
touch /etc/machine-id