diff --git a/tasks/lxc_install_dnf.yml b/tasks/lxc_install_dnf.yml index e42256b7..f8342d49 100644 --- a/tasks/lxc_install_dnf.yml +++ b/tasks/lxc_install_dnf.yml @@ -64,7 +64,7 @@ gpgkey: "file:///etc/pki/rpm-gpg/{{ lxc_centos_epel_key.split('/')[-1] }}" enabled: yes state: present - includepkgs: "aria2 systemd-networkd" + includepkgs: "systemd-networkd" register: install_epel_repo until: install_epel_repo is success retries: 5 diff --git a/templates/prep-scripts/redhat_prep.sh.j2 b/templates/prep-scripts/redhat_prep.sh.j2 index 05a18c31..76798932 100644 --- a/templates/prep-scripts/redhat_prep.sh.j2 +++ b/templates/prep-scripts/redhat_prep.sh.j2 @@ -33,9 +33,6 @@ chage -I -1 -d -1 -m 0 -M 99999 -E -1 root echo "nameserver {{ lxc_net_address }}" > /etc/resolv.conf systemctl enable systemd-networkd systemctl enable systemd-resolved -systemctl enable systemd-tmpfiles-setup -systemctl enable systemd-tmpfiles-setup-dev -systemctl enable systemd-tmpfiles-clean # Fully disable systemd-logind systemctl disable systemd-logind diff --git a/vars/debian-host.yml b/vars/debian-host.yml index 5d1e07b7..6da36cc2 100644 --- a/vars/debian-host.yml +++ b/vars/debian-host.yml @@ -21,7 +21,6 @@ _lxc_hosts_distro_packages: - apparmor - apparmor-profiles - apparmor-utils - - aria2 - bridge-utils - btrfs-progs - dbus diff --git a/vars/redhat-9-host.yml b/vars/redhat-9-host.yml new file mode 100644 index 00000000..6b00b3ac --- /dev/null +++ b/vars/redhat-9-host.yml @@ -0,0 +1,49 @@ +--- +# 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. + +system_config_dir: "/etc/sysconfig" +systemd_utils_prefix: "/lib/systemd" + +_lxc_centos_package_baseurl: "https://download.copr.fedorainfracloud.org/results/neil/lxc4.0/centos-stream-9-$basearch/" +_lxc_centos_package_key: "https://download.copr.fedorainfracloud.org/results/neil/lxc4.0/pubkey.gpg" + +# Required rpm packages. +_lxc_hosts_distro_packages: + - dbus + - dnsmasq + - git + - iptables + - libseccomp + - lxc + - lxc-devel + - lxc-libs + - lxc-templates-extra # requires lxc-templates + - network-scripts + - policycoreutils-python-utils + - procps + - python3-lxc + - systemd-container + - unzip + - xz + +lxc_xz_bin: xz + +lxc_cached_network_interfaces: + - src: "lxc-net-redhat-bridge.cfg.j2" + dest: "/etc/sysconfig/network-scripts/ifcfg-{{ lxc_net_bridge }}" + - src: "lxc-net-redhat-postdown.cfg.j2" + dest: "/etc/sysconfig/network-scripts/ifdown-post-{{ lxc_net_bridge }}" + mode: "0755" + interface: "${DEVICE}" diff --git a/vars/redhat-host.yml b/vars/redhat-host.yml index a5e1a830..9c5aea64 100644 --- a/vars/redhat-host.yml +++ b/vars/redhat-host.yml @@ -21,7 +21,6 @@ _lxc_centos_package_key: "https://download.copr.fedorainfracloud.org/results/thm # Required rpm packages. _lxc_hosts_distro_packages: - - aria2 - dbus - dnsmasq - git diff --git a/vars/redhat.yml b/vars/redhat.yml index 55d59dae..9bccdf54 100644 --- a/vars/redhat.yml +++ b/vars/redhat.yml @@ -50,6 +50,7 @@ _lxc_cache_distro_packages: - setup - sudo - systemd + - systemd-resolved - systemd-networkd - systemd-sysv - systemd-udev