diff --git a/container-images/tcib/base/base.yaml b/container-images/tcib/base/base.yaml index 6922b9bb4..359c45b9d 100644 --- a/container-images/tcib/base/base.yaml +++ b/container-images/tcib/base/base.yaml @@ -12,6 +12,7 @@ tcib_actions: crudini --set /etc/dnf/dnf.conf main plugins 1 && crudini --set /etc/dnf/dnf.conf main skip_missing_names_on_install False && crudini --set /etc/dnf/dnf.conf main tsflags nodocs +- run: if [ '{{ tcib_distro }}' == 'rhel' ]; then {% for item in tcib_packages.modules %}{% set key, value = (item.items() | list).0 %}dnf module -y {{ key }} {{ value }}; {% endfor %}fi - copy: /usr/share/tripleo-common/container-images/kolla/base/uid_gid_manage.sh /usr/local/bin/uid_gid_manage - run: chmod 755 /usr/local/bin/uid_gid_manage - run: bash /usr/local/bin/uid_gid_manage kolla hugetlbfs libvirt qemu @@ -54,4 +55,11 @@ tcib_packages: - sudo - tar - util-linux-user + modules: + - disable: container-tools:rhel8 + - disable: virt:rhel + - enable: container-tools:{{ tcib_rhel_modules['container-tools'] | default('2.0') }} + - enable: mariadb:{{ tcib_rhel_modules['mariadb'] | default('10.3') }} + - enable: virt:{{ tcib_rhel_modules['virt'] | default('8.2') }} + - enable: redis:{{ tcib_rhel_modules['redis'] | default('5') }} tcib_stopsignal: SIGTERM diff --git a/container-images/tcib/base/collectd/collectd.yaml b/container-images/tcib/base/collectd/collectd.yaml index b152652f1..14035056a 100644 --- a/container-images/tcib/base/collectd/collectd.yaml +++ b/container-images/tcib/base/collectd/collectd.yaml @@ -1,9 +1,5 @@ tcib_actions: - run: bash /usr/local/bin/uid_gid_manage collectd -- run: >- - if [ '{{ tcib_distro }}' == 'rhel' ]; then - {% for item in tcib_packages.modules %}{% set key, value = (item.items() | list).0 %}dnf module -y {{ key }} {{ value }}; {% endfor %} - fi - run: if [ "{{ tcib_distro }}" == "rhel" ]; then dnf -y install {{ tcib_packages['rhel'] | join(' ') }}; fi - run: if [ "$(uname -m)" == "x86_64" ]; then dnf -y install {{ tcib_packages['x86_64'] | join(' ') }}; fi - run: dnf -y install {{ tcib_packages['common'] | join(' ') }} && dnf clean all && rm -rf /var/cache/dnf @@ -51,9 +47,6 @@ tcib_packages: - collectd-write_prometheus - python3-collectd-gnocchi - python3-sqlalchemy-collectd - modules: - - disable: virt:rhel - - enable: virt:8.2 rhel: - python3-collectd-rabbitmq-monitoring x86_64: diff --git a/container-images/tcib/base/mariadb/mariadb.yaml b/container-images/tcib/base/mariadb/mariadb.yaml index 2a7f0320a..e401f5331 100644 --- a/container-images/tcib/base/mariadb/mariadb.yaml +++ b/container-images/tcib/base/mariadb/mariadb.yaml @@ -1,6 +1,5 @@ tcib_actions: - run: bash /usr/local/bin/uid_gid_manage {{ tcib_user }} -- run: if [ '{{ tcib_distro }}' == 'rhel' ]; then {% for item in tcib_packages.modules %}{% set key, value = (item.items() | list).0 %}dnf module -y {{ key }} {{ value }}; {% endfor %}fi - run: dnf -y install {{ tcib_packages['common'] | join(' ') }} && dnf clean all && rm -rf /var/cache/dnf - copy: /usr/share/tripleo-common/container-images/kolla/mariadb/extend_start.sh /usr/local/bin/kolla_extend_start - run: chmod 755 /usr/local/bin/kolla_extend_start @@ -30,6 +29,4 @@ tcib_packages: - rsync - tar - xinetd - modules: - - enable: mariadb:10.3 tcib_user: mysql diff --git a/container-images/tcib/base/os/ceilometer-base/ceilometer-central/ceilometer-central.yaml b/container-images/tcib/base/os/ceilometer-base/ceilometer-central/ceilometer-central.yaml index f1ea49975..ebe9f4a0f 100644 --- a/container-images/tcib/base/os/ceilometer-base/ceilometer-central/ceilometer-central.yaml +++ b/container-images/tcib/base/os/ceilometer-base/ceilometer-central/ceilometer-central.yaml @@ -1,11 +1,7 @@ tcib_actions: -- run: if [ '{{ tcib_distro }}' == 'rhel' ]; then {% for item in tcib_packages.modules %}{% set key, value = (item.items() | list).0 %}dnf module -y {{ key }} {{ value }}; {% endfor %}fi - run: dnf -y install {{ tcib_packages.common | join(' ') }} && dnf clean all && rm -rf /var/cache/dnf - run: ln -s /usr/share/openstack-tripleo-common/healthcheck/ceilometer-agent-central /openstack/healthcheck && chmod a+rx /openstack/healthcheck tcib_packages: common: - openstack-ceilometer-central - modules: - - disable: virt:rhel - - enable: virt:8.2 tcib_user: ceilometer diff --git a/container-images/tcib/base/os/ceilometer-base/ceilometer-compute/ceilometer-compute.yaml b/container-images/tcib/base/os/ceilometer-base/ceilometer-compute/ceilometer-compute.yaml index 4f0c319ec..a3981dd52 100644 --- a/container-images/tcib/base/os/ceilometer-base/ceilometer-compute/ceilometer-compute.yaml +++ b/container-images/tcib/base/os/ceilometer-base/ceilometer-compute/ceilometer-compute.yaml @@ -1,10 +1,6 @@ tcib_actions: -- run: if [ '{{ tcib_distro }}' == 'rhel' ]; then {% for item in tcib_packages.modules %}{% set key, value = (item.items() | list).0 %}dnf module -y {{ key }} {{ value }}; {% endfor %}fi - run: dnf -y install {{ tcib_packages.common | join(' ') }} && dnf clean all && rm -rf /var/cache/dnf - run: ln -s /usr/share/openstack-tripleo-common/healthcheck/ceilometer-agent-compute /openstack/healthcheck && chmod a+rx /openstack/healthcheck tcib_packages: common: - openstack-ceilometer-compute - modules: - - disable: virt:rhel - - enable: virt:8.2 diff --git a/container-images/tcib/base/os/ceilometer-base/ceilometer-ipmi/ceilometer-ipmi.yaml b/container-images/tcib/base/os/ceilometer-base/ceilometer-ipmi/ceilometer-ipmi.yaml index c52e3d65c..97bd0897e 100644 --- a/container-images/tcib/base/os/ceilometer-base/ceilometer-ipmi/ceilometer-ipmi.yaml +++ b/container-images/tcib/base/os/ceilometer-base/ceilometer-ipmi/ceilometer-ipmi.yaml @@ -1,11 +1,7 @@ tcib_actions: -- run: if [ '{{ tcib_distro }}' == 'rhel' ]; then {% for item in tcib_packages.modules %}{% set key, value = (item.items() | list).0 %}dnf module -y {{ key }} {{ value }}; {% endfor %}fi - run: dnf -y install {{ tcib_packages.common | join(' ') }} && dnf clean all && rm -rf /var/cache/dnf - run: ln -s /usr/share/openstack-tripleo-common/healthcheck/ceilometer-agent-ipmi /openstack/healthcheck && chmod a+rx /openstack/healthcheck tcib_packages: common: - openstack-ceilometer-ipmi - modules: - - disable: virt:rhel - - enable: virt:8.2 tcib_user: ceilometer diff --git a/container-images/tcib/base/os/cinder-base/cinder-base.yaml b/container-images/tcib/base/os/cinder-base/cinder-base.yaml index 0e82618e9..9d48cae78 100644 --- a/container-images/tcib/base/os/cinder-base/cinder-base.yaml +++ b/container-images/tcib/base/os/cinder-base/cinder-base.yaml @@ -1,6 +1,5 @@ tcib_actions: - run: bash /usr/local/bin/uid_gid_manage cinder -- run: if [ '{{ tcib_distro }}' == 'rhel' ]; then {% for item in tcib_packages.modules %}{% set key, value = (item.items() | list).0 %}dnf module -y {{ key }} {{ value }}; {% endfor %}fi - run: dnf -y install {{ tcib_packages.common | join(' ') }} && dnf clean all && rm -rf /var/cache/dnf tcib_packages: common: @@ -10,6 +9,3 @@ tcib_packages: - openstack-cinder - python3-automaton - python3-oslo-vmware - modules: - - disable: virt:rhel - - enable: virt:8.2 diff --git a/container-images/tcib/base/os/glance-api/glance-api.yaml b/container-images/tcib/base/os/glance-api/glance-api.yaml index b2d16a98d..b4e46a3bc 100644 --- a/container-images/tcib/base/os/glance-api/glance-api.yaml +++ b/container-images/tcib/base/os/glance-api/glance-api.yaml @@ -1,6 +1,5 @@ tcib_actions: - run: bash /usr/local/bin/uid_gid_manage {{ tcib_user }} -- run: if [ '{{ tcib_distro }}' == 'rhel' ]; then {% for item in tcib_packages.modules %}{% set key, value = (item.items() | list).0 %}dnf module -y {{ key }} {{ value }}; {% endfor %}fi - run: dnf -y install {{ tcib_packages['common'] | join(' ') }} && dnf clean all && rm -rf /var/cache/dnf - copy: /usr/share/tripleo-common/container-images/kolla/glance-api/extend_start.sh /usr/local/bin/kolla_extend_start - run: chmod 755 /usr/local/bin/kolla_extend_start @@ -16,7 +15,4 @@ tcib_packages: - python3-rados - python3-rbd - qemu-img - modules: - - disable: virt:rhel - - enable: virt:8.2 tcib_user: glance diff --git a/container-images/tcib/base/os/ironic-base/ironic-conductor/ironic-conductor.yaml b/container-images/tcib/base/os/ironic-base/ironic-conductor/ironic-conductor.yaml index b9ff57fae..f04951f6f 100644 --- a/container-images/tcib/base/os/ironic-base/ironic-conductor/ironic-conductor.yaml +++ b/container-images/tcib/base/os/ironic-base/ironic-conductor/ironic-conductor.yaml @@ -1,5 +1,4 @@ tcib_actions: -- run: if [ '{{ tcib_distro }}' == 'rhel' ]; then {% for item in tcib_packages.modules %}{% set key, value = (item.items() | list).0 %}dnf module -y {{ key }} {{ value }}; {% endfor %}fi - run: if [ "{{ tcib_distro }}" == "rhel" ]; then dnf -y install {{ tcib_packages['rhel'] | join(' ') }}; fi - run: dnf -y install {{ tcib_packages['common'] | join(' ') }} && dnf clean all && rm -rf /var/cache/dnf - run: ln -s /usr/share/openstack-tripleo-common/healthcheck/ironic-conductor /openstack/healthcheck && chmod a+rx /openstack/healthcheck @@ -25,9 +24,6 @@ tcib_packages: - qemu-img - util-linux - xfsprogs - modules: - - disable: virt:rhel - - enable: virt:8.2 rhel: - python-ovirt-engine-sdk4 - python3dist\(ansible\) diff --git a/container-images/tcib/base/os/mistral-base/mistral-executor/mistral-executor.yaml b/container-images/tcib/base/os/mistral-base/mistral-executor/mistral-executor.yaml index b1d1eb3e0..59168122b 100644 --- a/container-images/tcib/base/os/mistral-base/mistral-executor/mistral-executor.yaml +++ b/container-images/tcib/base/os/mistral-base/mistral-executor/mistral-executor.yaml @@ -1,5 +1,4 @@ tcib_actions: -- run: if [ '{{ tcib_distro }}' == 'rhel' ]; then {% for item in tcib_packages.modules %}{% set key, value = (item.items() | list).0 %}dnf module -y {{ key }} {{ value }}; {% endfor %}fi - run: dnf -y install {{ tcib_packages['common'] | join(' ') }} && dnf clean all && rm -rf /var/cache/dnf - run: ln -s /usr/share/openstack-tripleo-common/healthcheck/mistral-executor /openstack/healthcheck && chmod a+rx /openstack/healthcheck - run: test -f /usr/bin/ansible-playbook-3 || ln -s /usr/bin/ansible-playbook /usr/bin/ansible-playbook-3 @@ -11,9 +10,4 @@ tcib_packages: - openstack-tripleo-heat-templates - python3-novajoin - qemu-img - modules: - - disable: virt:rhel - - enable: virt:8.2 - - disable: container-tools:rhel8 - - enable: container-tools:2.0 tcib_user: mistral diff --git a/container-images/tcib/base/os/neutron-base/neutron-agent-base/neutron-agent-base.yaml b/container-images/tcib/base/os/neutron-base/neutron-agent-base/neutron-agent-base.yaml index b40e9f322..c562a7f40 100644 --- a/container-images/tcib/base/os/neutron-base/neutron-agent-base/neutron-agent-base.yaml +++ b/container-images/tcib/base/os/neutron-base/neutron-agent-base/neutron-agent-base.yaml @@ -1,10 +1,6 @@ tcib_actions: -- run: if [ '{{ tcib_distro }}' == 'rhel' ]; then {% for item in tcib_packages.modules %}{% set key, value = (item.items() | list).0 %}dnf module -y {{ key }} {{ value }}; {% endfor %}fi - run: dnf -y install {{ tcib_packages['common'] | join(' ') }} && dnf clean all && rm -rf /var/cache/dnf tcib_packages: common: - libseccomp - podman - modules: - - disable: container-tools:rhel8 - - enable: container-tools:2.0 diff --git a/container-images/tcib/base/os/nova-base/nova-compute-ironic/nova-compute-ironic.yaml b/container-images/tcib/base/os/nova-base/nova-compute-ironic/nova-compute-ironic.yaml index 7f5071c44..f72f4f599 100644 --- a/container-images/tcib/base/os/nova-base/nova-compute-ironic/nova-compute-ironic.yaml +++ b/container-images/tcib/base/os/nova-base/nova-compute-ironic/nova-compute-ironic.yaml @@ -1,5 +1,4 @@ tcib_actions: -- run: if [ '{{ tcib_distro }}' == 'rhel' ]; then {% for item in tcib_packages.modules %}{% set key, value = (item.items() | list).0 %}dnf module -y {{ key }} {{ value }}; {% endfor %}fi - run: dnf -y install {{ tcib_packages['common'] | join(' ') }} && dnf clean all && rm -rf /var/cache/dnf # this need to happen after installing nova-compute because the distgit does usermod to add libvirt/qemu groups - run: bash /usr/local/bin/uid_gid_manage nova @@ -10,7 +9,4 @@ tcib_packages: - nvme-cli - openstack-nova-compute - python3-novajoin - modules: - - disable: virt:rhel - - enable: virt:8.2 tcib_user: nova diff --git a/container-images/tcib/base/os/nova-base/nova-compute/nova-compute.yaml b/container-images/tcib/base/os/nova-base/nova-compute/nova-compute.yaml index 79cdc1e04..5bd4222ab 100644 --- a/container-images/tcib/base/os/nova-base/nova-compute/nova-compute.yaml +++ b/container-images/tcib/base/os/nova-base/nova-compute/nova-compute.yaml @@ -1,5 +1,4 @@ tcib_actions: -- run: if [ '{{ tcib_distro }}' == 'rhel' ]; then {% for item in tcib_packages.modules %}{% set key, value = (item.items() | list).0 %}dnf module -y {{ key }} {{ value }}; {% endfor %}fi - run: dnf -y install {{ tcib_packages['common'] | join(' ') }} && dnf clean all && rm -rf /var/cache/dnf # this need to happen after installing nova-compute because the distgit does usermod to add libvirt/qemu groups - run: bash /usr/local/bin/uid_gid_manage nova @@ -25,7 +24,4 @@ tcib_packages: - sysfsutils - targetcli - xfsprogs - modules: - - disable: virt:rhel - - enable: virt:8.2 tcib_user: nova diff --git a/container-images/tcib/base/os/nova-base/nova-libvirt/nova-libvirt.yaml b/container-images/tcib/base/os/nova-base/nova-libvirt/nova-libvirt.yaml index 11393c7cb..94c3a6a09 100644 --- a/container-images/tcib/base/os/nova-base/nova-libvirt/nova-libvirt.yaml +++ b/container-images/tcib/base/os/nova-base/nova-libvirt/nova-libvirt.yaml @@ -1,5 +1,4 @@ tcib_actions: -- run: if [ '{{ tcib_distro }}' == 'rhel' ]; then {% for item in tcib_packages.modules %}{% set key, value = (item.items() | list).0 %}dnf module -y {{ key }} {{ value }}; {% endfor %}fi - run: if [ "$(uname -m)" == "x86_64" ]; then dnf -y install {{ tcib_packages['x86_64'] | join(' ') }}; fi - run: dnf -y install {{ tcib_packages['common'] | join(' ') }} && dnf clean all && rm -rf /var/cache/dnf - run: ln -s /usr/share/openstack-tripleo-common/healthcheck/nova-libvirt /openstack/healthcheck && chmod a+rx /openstack/healthcheck @@ -20,10 +19,5 @@ tcib_packages: - podman - qemu-kvm - trousers - modules: - - disable: container-tools:rhel8 - - enable: container-tools:2.0 - - disable: virt:rhel - - enable: virt:8.2 x86_64: - edk2-ovmf diff --git a/container-images/tcib/base/os/nova-base/nova-scheduler/nova-scheduler.yaml b/container-images/tcib/base/os/nova-base/nova-scheduler/nova-scheduler.yaml index 291e03ac2..0c2938fb5 100644 --- a/container-images/tcib/base/os/nova-base/nova-scheduler/nova-scheduler.yaml +++ b/container-images/tcib/base/os/nova-base/nova-scheduler/nova-scheduler.yaml @@ -1,12 +1,8 @@ tcib_actions: -- run: if [ '{{ tcib_distro }}' == 'rhel' ]; then {% for item in tcib_packages.modules %}{% set key, value = (item.items() | list).0 %}dnf module -y {{ key }} {{ value }}; {% endfor %}fi - run: dnf -y install {{ tcib_packages['common'] | join(' ') }} && dnf clean all && rm -rf /var/cache/dnf - run: ln -s /usr/share/openstack-tripleo-common/healthcheck/nova-scheduler /openstack/healthcheck && chmod a+rx /openstack/healthcheck tcib_packages: common: - openstack-nova-scheduler - openstack-tripleo-common - modules: - - disable: virt:rhel - - enable: virt:8.2 tcib_user: nova diff --git a/container-images/tcib/base/redis/redis.yaml b/container-images/tcib/base/redis/redis.yaml index 0bdc640f7..22181494f 100644 --- a/container-images/tcib/base/redis/redis.yaml +++ b/container-images/tcib/base/redis/redis.yaml @@ -1,6 +1,5 @@ tcib_actions: - run: bash /usr/local/bin/uid_gid_manage {{ tcib_user }} -- run: if [ '{{ tcib_distro }}' == 'rhel' ]; then {% for item in tcib_packages.modules %}{% set key, value = (item.items() | list).0 %}dnf module -y {{ key }} {{ value }}; {% endfor %}fi - run: dnf -y install {{ tcib_packages.common | join(' ') }} && dnf clean all && rm -rf /var/cache/dnf - run: mkdir /etc/libqb - run: ln -s /usr/share/openstack-tripleo-common/healthcheck/redis /openstack/healthcheck && chmod a+rx /openstack/healthcheck @@ -14,6 +13,4 @@ tcib_packages: - redis - resource-agents - stunnel - modules: - - install: redis:5 tcib_user: redis