Clean up bionic variables
Since 18.04 is unsupported, we cleanup related variables and preparation scripts. Change-Id: I5d25d63a30f24ac5daf3268c03b3248415a42cc7
This commit is contained in:
Dmitriy Rabotyagov
parent
94d2856291
commit
65311aec6d
@ -22,10 +22,9 @@ galaxy_info:
|
|||||||
platforms:
|
platforms:
|
||||||
- name: Debian
|
- name: Debian
|
||||||
versions:
|
versions:
|
||||||
- buster
|
- bullseye
|
||||||
- name: Ubuntu
|
- name: Ubuntu
|
||||||
versions:
|
versions:
|
||||||
- bionic
|
|
||||||
- focal
|
- focal
|
||||||
- name: EL
|
- name: EL
|
||||||
versions:
|
versions:
|
||||||
|
|||||||
@ -1,46 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
set -e -x
|
|
||||||
|
|
||||||
{{ lxc_cache_prep_pre_commands }}
|
|
||||||
|
|
||||||
{% include 'templates/prep-scripts/_container_sys_setup.sh.j2' %}
|
|
||||||
|
|
||||||
export DEBIAN_FRONTEND=noninteractive
|
|
||||||
apt-get remove -y --purge snap* lxc* lxd* resolvconf* || true
|
|
||||||
|
|
||||||
# Update base distribution
|
|
||||||
apt-get update
|
|
||||||
apt-get upgrade -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" --force-yes
|
|
||||||
apt-get install -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" --force-yes {{ lxc_cache_distro_packages | join(' ') }}
|
|
||||||
apt-get upgrade -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" --force-yes
|
|
||||||
rm -f /usr/bin/python
|
|
||||||
rm /etc/machine-id || true
|
|
||||||
rm /var/lib/dbus/machine-id || true
|
|
||||||
touch /etc/machine-id
|
|
||||||
rm /etc/sysctl.d/* || true
|
|
||||||
echo '' > /etc/sysctl.conf
|
|
||||||
ln -s /usr/bin/python2.7 /usr/bin/python
|
|
||||||
mkdir -p /root/.ssh
|
|
||||||
chmod 700 /root/.ssh
|
|
||||||
userdel --force --remove ubuntu || true
|
|
||||||
apt-get clean
|
|
||||||
mkdir -p /var/backup
|
|
||||||
mkdir -p /etc/network/interfaces.d
|
|
||||||
chage -I -1 -d -1 -m 0 -M 99999 -E -1 root
|
|
||||||
for action in disable mask; do
|
|
||||||
systemctl ${action} resolvconf.service || true
|
|
||||||
systemctl ${action} systemd-networkd-resolvconf-update.path || true
|
|
||||||
systemctl ${action} systemd-networkd-resolvconf-update.service || true
|
|
||||||
done
|
|
||||||
|
|
||||||
{% for locale in lxc_cache_locales %}
|
|
||||||
locale-gen {{ locale }}
|
|
||||||
{% if loop.first | bool %}
|
|
||||||
update-locale LANG={{ locale }}
|
|
||||||
{% endif %}
|
|
||||||
{% endfor %}
|
|
||||||
|
|
||||||
# Set the IP of the lxcbr0 interface as the DNS server
|
|
||||||
echo "nameserver {{ lxc_net_address }}" > /etc/resolv.conf
|
|
||||||
systemctl enable systemd-networkd
|
|
||||||
{{ lxc_cache_prep_post_commands }}
|
|
||||||
@ -1,51 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
# TODO(evrardjp): Make this script ubuntu version agnostic or
|
|
||||||
# remove it if no change happens in bionic vs xenial
|
|
||||||
set -e -x
|
|
||||||
|
|
||||||
{{ lxc_cache_prep_pre_commands }}
|
|
||||||
|
|
||||||
{% include 'templates/prep-scripts/_container_sys_setup.sh.j2' %}
|
|
||||||
|
|
||||||
export DEBIAN_FRONTEND=noninteractive
|
|
||||||
apt-get remove -y --purge snap* lxc* lxd* resolvconf* || true
|
|
||||||
|
|
||||||
# Update base distribution
|
|
||||||
apt-get update
|
|
||||||
|
|
||||||
apt-get install -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" --force-yes eatmydata
|
|
||||||
export LD_PRELOAD=/usr/lib/{{ ansible_facts['architecture'] }}-linux-gnu/libeatmydata.so
|
|
||||||
|
|
||||||
apt-get install -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" --force-yes gnupg
|
|
||||||
apt-get upgrade -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" --force-yes
|
|
||||||
apt-get install -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" --force-yes {{ lxc_cache_distro_packages | join(' ') }}
|
|
||||||
apt-get upgrade -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" --force-yes
|
|
||||||
rm /etc/machine-id || true
|
|
||||||
rm /var/lib/dbus/machine-id || true
|
|
||||||
touch /etc/machine-id
|
|
||||||
rm /etc/sysctl.d/* || true
|
|
||||||
echo '' > /etc/sysctl.conf
|
|
||||||
mkdir -p /root/.ssh
|
|
||||||
chmod 700 /root/.ssh
|
|
||||||
userdel --force --remove ubuntu || true
|
|
||||||
apt-get clean
|
|
||||||
mkdir -p /var/backup
|
|
||||||
mkdir -p /etc/network/interfaces.d
|
|
||||||
chage -I -1 -d -1 -m 0 -M 99999 -E -1 root
|
|
||||||
for action in disable mask; do
|
|
||||||
systemctl ${action} resolvconf.service || true
|
|
||||||
systemctl ${action} systemd-networkd-resolvconf-update.path || true
|
|
||||||
systemctl ${action} systemd-networkd-resolvconf-update.service || true
|
|
||||||
done
|
|
||||||
|
|
||||||
{% for locale in lxc_cache_locales %}
|
|
||||||
locale-gen {{ locale }}
|
|
||||||
{% if loop.first | bool %}
|
|
||||||
update-locale LANG={{ locale }}
|
|
||||||
{% endif %}
|
|
||||||
{% endfor %}
|
|
||||||
|
|
||||||
# Set the IP of the lxcbr0 interface as the DNS server
|
|
||||||
echo "nameserver {{ lxc_net_address }}" > /etc/resolv.conf
|
|
||||||
systemctl enable systemd-networkd
|
|
||||||
{{ lxc_cache_prep_post_commands }}
|
|
||||||
@ -1,58 +0,0 @@
|
|||||||
---
|
|
||||||
# Copyright 2016, Rackspace US, Inc.
|
|
||||||
#
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
# you may not use this file except in compliance with the License.
|
|
||||||
# You may obtain a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
# See the License for the specific language governing permissions and
|
|
||||||
# limitations under the License.
|
|
||||||
|
|
||||||
## APT Cache Options
|
|
||||||
cache_timeout: 600
|
|
||||||
|
|
||||||
# Required apt packages.
|
|
||||||
_lxc_hosts_distro_packages:
|
|
||||||
- apparmor
|
|
||||||
- apparmor-profiles
|
|
||||||
- apparmor-utils
|
|
||||||
- aria2
|
|
||||||
- bridge-utils
|
|
||||||
- btrfs-tools
|
|
||||||
- cgroup-lite
|
|
||||||
- dbus
|
|
||||||
- debootstrap
|
|
||||||
- dnsmasq-base
|
|
||||||
- git
|
|
||||||
- gzip
|
|
||||||
- ifupdown
|
|
||||||
- iptables
|
|
||||||
- irqbalance
|
|
||||||
- language-pack-en
|
|
||||||
- liblxc1
|
|
||||||
- lxc
|
|
||||||
- lxc-dev
|
|
||||||
- lxc-templates
|
|
||||||
- procps
|
|
||||||
- python3-lxc
|
|
||||||
- python3-dev
|
|
||||||
- systemd-container
|
|
||||||
- xz-utils
|
|
||||||
|
|
||||||
# Package to remove from the host
|
|
||||||
lxc_hosts_remove_distro_packages:
|
|
||||||
- dnsmasq
|
|
||||||
|
|
||||||
lxc_xz_bin: xz
|
|
||||||
|
|
||||||
system_config_dir: "/etc/default"
|
|
||||||
systemd_utils_prefix: "/lib/systemd"
|
|
||||||
|
|
||||||
lxc_cached_network_interfaces:
|
|
||||||
- src: "lxc-net-bridge.cfg.j2"
|
|
||||||
dest: "/etc/network/interfaces.d/lxc-net-bridge.cfg"
|
|
||||||
@ -1,49 +0,0 @@
|
|||||||
---
|
|
||||||
# Copyright 2016, Rackspace US, Inc.
|
|
||||||
#
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
# you may not use this file except in compliance with the License.
|
|
||||||
# You may obtain a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
# See the License for the specific language governing permissions and
|
|
||||||
# limitations under the License.
|
|
||||||
|
|
||||||
_lxc_hosts_container_build_command: "debootstrap --variant minbase {{ ansible_facts['distribution_release'] }} /var/lib/machines/{{ lxc_container_base_name }} "
|
|
||||||
|
|
||||||
_lxc_cache_map:
|
|
||||||
distro: ubuntu
|
|
||||||
arch: "{{ lxc_architecture_mapping.get( ansible_facts['architecture'] ) }}"
|
|
||||||
release: bionic
|
|
||||||
copy_from_host:
|
|
||||||
- /etc/apt/sources.list
|
|
||||||
- /etc/apt/apt.conf.d/
|
|
||||||
- /etc/apt/trusted.gpg.d/
|
|
||||||
- /etc/apt/trusted.gpg
|
|
||||||
- /etc/apt/preferences.d/
|
|
||||||
- /etc/environment
|
|
||||||
- /etc/localtime
|
|
||||||
- /etc/protocols
|
|
||||||
|
|
||||||
_lxc_cache_prep_template: "prep-scripts/ubuntu_18_prep.sh.j2"
|
|
||||||
|
|
||||||
# This list should contain a minimum set of packages. Add extra packages via roles that require them.
|
|
||||||
_lxc_cache_distro_packages:
|
|
||||||
- ca-certificates
|
|
||||||
- dbus
|
|
||||||
- iproute2
|
|
||||||
- iputils-ping
|
|
||||||
- locales
|
|
||||||
- netbase
|
|
||||||
- openssh-server
|
|
||||||
- python3
|
|
||||||
- libpython3.6
|
|
||||||
- rsync # os_keystone runs serial=1 and uses rsync before the distro packages have been installed on all keystone targets
|
|
||||||
- sudo
|
|
||||||
- systemd
|
|
||||||
- systemd-sysv
|
|
||||||
- tzdata
|
|
||||||
Loading…
Reference in New Issue
Block a user