commit cdd6315a8b486d13e13fa7b9783000f32aa22294 Author: Jonathan Rosser Date: Wed Oct 24 16:26:10 2018 +0100 Minimise distro packages installed into the lxc image This patch removes all packages from the lxc image cache preparation which are not required to run the 'setup-hosts' playbook, or pass the lxc_hosts role tests. Additional packages should be installed by the ansible roles which further customise the containers. Depends-On: https://review.openstack.org/619040 Change-Id: I9bdc698e4c712a6fb3d7a3b76413b478e1e7e91a diff --git a/vars/debian.yml b/vars/debian.yml index cc0d9de..438010e 100644 --- a/vars/debian.yml +++ b/vars/debian.yml @@ -31,27 +31,15 @@ _lxc_cache_map: _lxc_cache_prep_template: "prep-scripts/debian_prep.sh.j2" +# This list should contain a minimum set of packages. Add extra packages via roles that require them. _lxc_cache_distro_packages: - - apt-transport-https - ca-certificates - - cron - dbus - - debianutils - - gcc - - iproute2 - iputils-ping - - libffi-dev - - libssl-dev - locales - - netbase - openssh-server - - openssl - - procps - - python3-lxc - - python3-dev - - rsync + - python3 - sudo - systemd - systemd-sysv - - tar - - wget + - tzdata diff --git a/vars/redhat.yml b/vars/redhat.yml index 3f2a3fc..014d035 100644 --- a/vars/redhat.yml +++ b/vars/redhat.yml @@ -33,19 +33,12 @@ _lxc_cache_prep_template: "prep-scripts/centos_8_prep.sh.j2" _lxc_cache_distro_packages: - ca-certificates - - cronie - - gcc - - iproute - iputils - openssh-server - - openssl - - policycoreutils - - rsync - - setup + - python3 - sudo - systemd - systemd-networkd + - systemd-resolvd - systemd-sysv - - tar - - wget - - which + - tzdata diff --git a/vars/suse.yml b/vars/suse.yml index b54190a..2c8bbf9 100644 --- a/vars/suse.yml +++ b/vars/suse.yml @@ -36,25 +36,13 @@ _lxc_cache_map: _lxc_cache_prep_template: "prep-scripts/opensuse_leap_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-mozilla - - cronie - - dbus-1 - - gcc - - iproute2 - iputils - - libffi-devel - - libopenssl-devel - - netcfg - openssh - - openssl - python - - python-devel - - python-xml - - rsync - sudo - systemd - systemd-sysvinit - - tar - - wget - - which + - timezone diff --git a/vars/ubuntu-18.04.yml b/vars/ubuntu-18.04.yml index b0a5670..66c7ef6 100644 --- a/vars/ubuntu-18.04.yml +++ b/vars/ubuntu-18.04.yml @@ -31,25 +31,15 @@ _lxc_cache_map: _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: - - apt-transport-https - ca-certificates - - cron # bionic doesn't have cronie - dbus - - debianutils # for 'which' executable - - gcc - - iproute2 - iputils-ping - - libffi-dev - - libssl-dev - locales - - netbase - openssh-server - - openssl - - python3-dev - - rsync + - python3 - sudo - systemd - systemd-sysv - - tar - - wget + - tzdata diff --git a/vars/ubuntu-20.04.yml b/vars/ubuntu-20.04.yml index c08e966..2bde8af 100644 --- a/vars/ubuntu-20.04.yml +++ b/vars/ubuntu-20.04.yml @@ -30,25 +30,15 @@ _lxc_cache_map: _lxc_cache_prep_template: "prep-scripts/ubuntu_20_prep.sh.j2" +# This list should contain a minimum set of packages. Add extra packages via roles that require them. _lxc_cache_distro_packages: - - apt-transport-https - ca-certificates - - cron # bionic doesn't have cronie - dbus - - debianutils # for 'which' executable - - gcc - - iproute2 - iputils-ping - - libffi-dev - - libssl-dev - locales - - netbase - openssh-server - - openssl - - python3-dev - - rsync + - python3 - sudo - systemd - systemd-sysv - - tar - - wget + - tzdata