Merge "[squash] Backport RHEL modules into base image" into stable/train
This commit is contained in:
commit
f83546b82e
|
@ -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.3') }}
|
||||
- enable: redis:{{ tcib_rhel_modules['redis'] | default('5') }}
|
||||
tcib_stopsignal: SIGTERM
|
||||
|
|
|
@ -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.3
|
||||
rhel:
|
||||
- python3-collectd-rabbitmq-monitoring
|
||||
x86_64:
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
tcib_actions:
|
||||
- run: 'echo "%kolla ALL=(root) NOPASSWD: /usr/local/bin/kolla_security_reset" > /etc/sudoers.d/security_reset && chmod 640 /etc/sudoers.d/security_reset'
|
||||
- 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
|
||||
|
@ -31,6 +30,4 @@ tcib_packages:
|
|||
- rsync
|
||||
- tar
|
||||
- xinetd
|
||||
modules:
|
||||
- enable: mariadb:10.3
|
||||
tcib_user: mysql
|
||||
|
|
|
@ -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.3
|
||||
tcib_user: ceilometer
|
||||
|
|
|
@ -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.3
|
||||
|
|
|
@ -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.3
|
||||
tcib_user: ceilometer
|
||||
|
|
|
@ -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.3
|
||||
|
|
|
@ -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.3
|
||||
tcib_user: glance
|
||||
|
|
|
@ -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.3
|
||||
rhel:
|
||||
- python-ovirt-engine-sdk4
|
||||
- python3dist\(ansible\)
|
||||
|
|
|
@ -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
|
||||
|
@ -13,9 +12,4 @@ tcib_packages:
|
|||
- openstack-tripleo-validations
|
||||
- python3-novajoin
|
||||
- qemu-img
|
||||
modules:
|
||||
- disable: virt:rhel
|
||||
- enable: virt:8.3
|
||||
- disable: container-tools:rhel8
|
||||
- enable: container-tools:2.0
|
||||
tcib_user: mistral
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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.3
|
||||
tcib_user: nova
|
||||
|
|
|
@ -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.3
|
||||
tcib_user: nova
|
||||
|
|
|
@ -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.3
|
||||
x86_64:
|
||||
- edk2-ovmf
|
||||
|
|
|
@ -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.3
|
||||
tcib_user: nova
|
||||
|
|
|
@ -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…
Reference in New Issue