Merge "Prepare to switch CentOS 8 job voting again"
This commit is contained in:
commit
f259b6ce3f
|
@ -4,6 +4,7 @@ init_dest_dir: /usr/lib/systemd/system/
|
|||
init_ext: .service
|
||||
ipxe_dir: /usr/share/ipxe/
|
||||
ipxe_full_binary: ipxe.lkrn
|
||||
ipxe_efi_binary: ipxe-x86_64.efi
|
||||
ironic_rootwrap_dir: /usr/bin/
|
||||
nginx_user: nginx
|
||||
mysql_service_name: mariadb
|
||||
|
@ -11,9 +12,9 @@ tftp_service_name: tftp
|
|||
required_packages:
|
||||
- mariadb-server
|
||||
- dnsmasq
|
||||
- python-devel
|
||||
- MySQL-python
|
||||
- python-iniparse
|
||||
- python3-devel
|
||||
- python3-PyMySQL
|
||||
- python3-iniparse
|
||||
- libffi-devel
|
||||
- libxslt-devel
|
||||
- openssl-devel
|
||||
|
@ -28,14 +29,14 @@ required_packages:
|
|||
- wget
|
||||
- genisoimage
|
||||
- kpartx
|
||||
- qemu-kvm-tools
|
||||
- kernel-tools
|
||||
- qemu-img
|
||||
- openwsman-python
|
||||
- libselinux-python
|
||||
- policycoreutils-python
|
||||
- openwsman-python3
|
||||
- python3-libselinux
|
||||
- python3-policycoreutils
|
||||
- debootstrap
|
||||
- gcc
|
||||
- python2-pip
|
||||
- python3-pip
|
||||
- socat
|
||||
iscsi_required_packages:
|
||||
- iscsi-initiator-utils
|
||||
|
|
|
@ -4,6 +4,7 @@ init_dest_dir: /usr/lib/systemd/system/
|
|||
init_ext: .service
|
||||
ipxe_dir: /usr/share/ipxe/
|
||||
ipxe_full_binary: ipxe.lkrn
|
||||
ipxe_efi_binary: ipxe-x86_64.efi
|
||||
sgabios_dir: /usr/share/sgabios/
|
||||
nginx_user: nginx
|
||||
virt_group: libvirt
|
||||
|
@ -11,13 +12,13 @@ mysql_service_name: mariadb
|
|||
tftp_service_name: tftp
|
||||
required_packages:
|
||||
- mariadb-server
|
||||
- python-devel
|
||||
- MySQL-python
|
||||
- python-iniparse
|
||||
- python3-devel
|
||||
- python3-PyMySQL
|
||||
- python3-iniparse
|
||||
- libffi-devel
|
||||
- libxslt-devel
|
||||
- openssl-devel
|
||||
- libxml2-devel
|
||||
- nginx
|
||||
- uwsgi
|
||||
- uwsgi-plugin-python2
|
||||
- uwsgi-plugin-python3
|
||||
|
|
|
@ -79,8 +79,8 @@ case ${ID,,} in
|
|||
[lsb-release]=redhat-lsb
|
||||
[make]=make
|
||||
[net-tools]=net-tools
|
||||
[python]=python3
|
||||
[python-devel]=python3-devel
|
||||
[python3]=python3
|
||||
[python3-devel]=python3-devel
|
||||
[wget]=wget
|
||||
)
|
||||
EXTRA_PKG_DEPS=()
|
||||
|
@ -96,9 +96,9 @@ esac
|
|||
# if running in OpenStack CI, then make sure epel is enabled
|
||||
# since it may already be present (but disabled) on the host
|
||||
if env | grep -q ^ZUUL; then
|
||||
if [[ -x '/usr/bin/yum' ]]; then
|
||||
${INSTALLER_CMD} yum-utils
|
||||
sudo yum-config-manager --enable epel || true
|
||||
if [ "${OS_FAMILY}" == "RedHat" ]; then
|
||||
${INSTALLER_CMD} dnf-utils
|
||||
sudo dnf config-manager --set-enabled epel || true
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
Loading…
Reference in New Issue