Browse Source

Merge "TCIB: move RHEL modules into base image" into stable/ussuri

changes/83/748283/1
Zuul 1 month ago
committed by Gerrit Code Review
parent
commit
57a8963ea6
16 changed files with 8 additions and 65 deletions
  1. +8
    -0
      container-images/tcib/base/base.yaml
  2. +0
    -7
      container-images/tcib/base/collectd/collectd.yaml
  3. +0
    -3
      container-images/tcib/base/mariadb/mariadb.yaml
  4. +0
    -4
      container-images/tcib/base/os/ceilometer-base/ceilometer-central/ceilometer-central.yaml
  5. +0
    -4
      container-images/tcib/base/os/ceilometer-base/ceilometer-compute/ceilometer-compute.yaml
  6. +0
    -4
      container-images/tcib/base/os/ceilometer-base/ceilometer-ipmi/ceilometer-ipmi.yaml
  7. +0
    -4
      container-images/tcib/base/os/cinder-base/cinder-base.yaml
  8. +0
    -4
      container-images/tcib/base/os/glance-api/glance-api.yaml
  9. +0
    -4
      container-images/tcib/base/os/ironic-base/ironic-conductor/ironic-conductor.yaml
  10. +0
    -6
      container-images/tcib/base/os/mistral-base/mistral-executor/mistral-executor.yaml
  11. +0
    -4
      container-images/tcib/base/os/neutron-base/neutron-agent-base/neutron-agent-base.yaml
  12. +0
    -4
      container-images/tcib/base/os/nova-base/nova-compute-ironic/nova-compute-ironic.yaml
  13. +0
    -4
      container-images/tcib/base/os/nova-base/nova-compute/nova-compute.yaml
  14. +0
    -6
      container-images/tcib/base/os/nova-base/nova-libvirt/nova-libvirt.yaml
  15. +0
    -4
      container-images/tcib/base/os/nova-base/nova-scheduler/nova-scheduler.yaml
  16. +0
    -3
      container-images/tcib/base/redis/redis.yaml

+ 8
- 0
container-images/tcib/base/base.yaml View File

@@ -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

+ 0
- 7
container-images/tcib/base/collectd/collectd.yaml View File

@@ -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:


+ 0
- 3
container-images/tcib/base/mariadb/mariadb.yaml View File

@@ -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

+ 0
- 4
container-images/tcib/base/os/ceilometer-base/ceilometer-central/ceilometer-central.yaml View File

@@ -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

+ 0
- 4
container-images/tcib/base/os/ceilometer-base/ceilometer-compute/ceilometer-compute.yaml View File

@@ -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

+ 0
- 4
container-images/tcib/base/os/ceilometer-base/ceilometer-ipmi/ceilometer-ipmi.yaml View File

@@ -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

+ 0
- 4
container-images/tcib/base/os/cinder-base/cinder-base.yaml View File

@@ -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

+ 0
- 4
container-images/tcib/base/os/glance-api/glance-api.yaml View File

@@ -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

+ 0
- 4
container-images/tcib/base/os/ironic-base/ironic-conductor/ironic-conductor.yaml View File

@@ -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\)


+ 0
- 6
container-images/tcib/base/os/mistral-base/mistral-executor/mistral-executor.yaml View File

@@ -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

+ 0
- 4
container-images/tcib/base/os/neutron-base/neutron-agent-base/neutron-agent-base.yaml View File

@@ -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

+ 0
- 4
container-images/tcib/base/os/nova-base/nova-compute-ironic/nova-compute-ironic.yaml View File

@@ -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

+ 0
- 4
container-images/tcib/base/os/nova-base/nova-compute/nova-compute.yaml View File

@@ -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

+ 0
- 6
container-images/tcib/base/os/nova-base/nova-libvirt/nova-libvirt.yaml View File

@@ -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

+ 0
- 4
container-images/tcib/base/os/nova-base/nova-scheduler/nova-scheduler.yaml View File

@@ -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

+ 0
- 3
container-images/tcib/base/redis/redis.yaml View File

@@ -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

Loading…
Cancel
Save