From 932fbd2292c301d98cc1cda6e9805854f73b9334 Mon Sep 17 00:00:00 2001 From: fuyong Date: Mon, 6 Jan 2020 16:14:05 +0800 Subject: [PATCH] Disable integ model's packages that not have been built centos_pkg_dirs: temporarily disable packages Disable the packages that do not build correctly and are further upgrades. centos_iso_image.inc: Forbid installation to the generated ISO Change-Id: I7d85da132628576fb2cce303e4b3acad4bbbb174 Story: 2006844 Task: 37670 Signed-off-by: fuyong --- centos_iso_image.inc | 116 +++++++++++++++++++++---------------------- centos_pkg_dirs | 34 ++++++------- 2 files changed, 75 insertions(+), 75 deletions(-) diff --git a/centos_iso_image.inc b/centos_iso_image.inc index 8634a8590..f1cebf812 100644 --- a/centos_iso_image.inc +++ b/centos_iso_image.inc @@ -27,11 +27,11 @@ libvirt-client # python-ryu -python2-ryu -python-ryu-common +#python2-ryu +#python-ryu-common # python-smartpm -python-smartpm +#python-smartpm # lldpd lldpd @@ -53,15 +53,15 @@ swtpm-tools # python-3parclient -python-3parclient +#python-3parclient # python-lefthandclient -python-lefthandclient +#python-lefthandclient # docker-distribution -docker-distribution +#docker-distribution # helm helm @@ -74,46 +74,46 @@ helm # e1000e-kmod kmod-e1000e -kmod-e1000e-rt +#kmod-e1000e-rt # i40e-kmod kmod-i40e -kmod-i40e-rt +#kmod-i40e-rt # iavf-kmod -kmod-iavf -kmod-iavf-rt +#kmod-iavf +#kmod-iavf-rt # ixgbevf-kmod kmod-ixgbevf -kmod-ixgbevf-rt +#kmod-ixgbevf-rt # ixgbe-kmod kmod-ixgbe -kmod-ixgbe-rt +#kmod-ixgbe-rt # qat17 qat17 -qat17-rt +#qat17-rt # tpm-kmod -kmod-tpm -kmod-tpm-rt +#kmod-tpm +#kmod-tpm-rt # integrity-kmod -kmod-integrity -kmod-integrity-rt +#kmod-integrity +#kmod-integrity-rt # drbd-kernel kmod-drbd -kmod-drbd-rt +#kmod-drbd-rt # opae-intel-fpga-driver -kmod-opae-fpga-driver -kmod-opae-fpga-driver-rt +#kmod-opae-fpga-driver +#kmod-opae-fpga-driver-rt # rpm -rpm-plugin-systemd-inhibit +#rpm-plugin-systemd-inhibit # dpkg dpkg @@ -125,12 +125,12 @@ cgcs-users ldapscripts # drbd -drbd -drbd-utils -drbd-udev -drbd-pacemaker -drbd-heartbeat -drbd-bash-completion +#drbd +#drbd-utils +#drbd-udev +#drbd-pacemaker +#drbd-heartbeat +#drbd-bash-completion # initscripts @@ -140,14 +140,14 @@ initscripts setup # nss-pam-ldapd -nss-pam-ldapd +#nss-pam-ldapd # nfs-utils series package # dhcp -dhcp -dhclient +dhcp-server +dhcp-client # openssh openssh @@ -158,25 +158,25 @@ openssh-server facter # vim -vim-enhanced +#vim-enhanced # python -python +#python # libvirt-python -python2-libvirt +python3-libvirt # lighttpd lighttpd -lighttpd-fastcgi -lighttpd-mod_geoip +#lighttpd-fastcgi +#lighttpd-mod_geoip lighttpd-mod_mysql_vhost # logrotate logrotate # novnc -novnc +#novnc # sudo sudo @@ -186,7 +186,7 @@ sudo # net-snmp net-snmp-utils net-snmp-libs -net-snmp-python +#net-snmp-python # openldap openldap @@ -197,7 +197,7 @@ openldap-clients openvswitch # libevent -libevent +#libevent # tpm2-tools tpm2-tools @@ -209,10 +209,10 @@ kernel kernel-tools kernel-tools-libs perf -python-perf +python3-perf # puppet -puppet +#puppet # systemd systemd @@ -224,14 +224,14 @@ tboot memcached # kubernetes -kubernetes -kubernetes-master -kubernetes-node -kubernetes-kubeadm -kubernetes-client +#kubernetes +#kubernetes-master +#kubernetes-node +#kubernetes-kubeadm +#kubernetes-client # resource-agents -resource-agents +#resource-agents # haproxy @@ -241,7 +241,7 @@ haproxy # iptables # python-psycopg2 -python-psycopg2 +#python-psycopg2 # dnsmasq dnsmasq @@ -251,34 +251,34 @@ dnsmasq-utils parted # python-keyring -python-keyring +#python-keyring # grub2 grub2-tools grub2-efi-x64-modules # kernel-rt -kernel-rt -kernel-rt-kvm -kernel-rt-tools +#kernel-rt +#kernel-rt-kvm +#kernel-rt-tools # mellanox drivers -rdma-core -mlnx-ofa_kernel-modules -mlnx-ofa_kernel-rt-modules +#rdma-core +#mlnx-ofa_kernel-modules +#mlnx-ofa_kernel-rt-modules # python2-ruamel-yaml -python2-ruamel-yaml +#python2-ruamel-yaml # redfish tool Redfishtool # kvm-timer-advance (AIO and worker nodes only) -kvm-timer-advance +#kvm-timer-advance # aws packages for interacting with amazon aws registry # botocore is an unspecified requirement of boto3 -python2-botocore -python-boto3 +#python2-botocore +#python-boto3 diff --git a/centos_pkg_dirs b/centos_pkg_dirs index a358915d9..8732fda6d 100644 --- a/centos_pkg_dirs +++ b/centos_pkg_dirs @@ -2,18 +2,18 @@ base/initscripts base/setup base/dhcp base/openssh -#config/facter -#virt/qemu -python/python-setuptools -#virt/libvirt -#virt/libvirt-python -#base/lighttpd +config/facter +virt/qemu +#python/python-setuptools +virt/libvirt +virt/libvirt-python +base/lighttpd #networking/python-ryu #python/python-smartpm #python/python-voluptuous -#networking/lldpd +networking/lldpd #logging/logrotate -#security/shim-unsigned +security/shim-unsigned #security/shim-signed base/sudo virt/cloud-init @@ -24,11 +24,11 @@ networking/openvswitch #base/libevent security/tss2 security/tpm2-tools -#security/libtpms -#security/swtpm +security/libtpms +security/swtpm security/spectre-meltdown-checker kernel/kernel-std -#config/puppet-4.8.2 +config/puppet-4.8.2 config/puppet-modules/puppet-boolean-1.0.2 config/puppet-modules/puppet-create_resources config/puppet-modules/puppet-dnsmasq @@ -59,7 +59,7 @@ security/tboot #kernel/kernel-modules/mlnx-ofa_kernel #networking/mellanox/rdma-core #docker/python-docker -#kubernetes/kubernetes +kubernetes/kubernetes #kubernetes/docker-distribution kubernetes/etcd kubernetes/helm @@ -70,8 +70,8 @@ kernel/kernel-modules/intel-i40e kernel/kernel-modules/intel-ixgbevf kernel/kernel-modules/intel-ixgbe kernel/kernel-modules/qat17 -kernel/kernel-modules/tpmdd -kernel/kernel-modules/integrity +#kernel/kernel-modules/tpmdd +#kernel/kernel-modules/integrity kernel/kernel-modules/drbd #kernel/kernel-modules/intel-opae-fpga base/dpkg @@ -80,15 +80,15 @@ base/cluster-resource-agents base/libfdt base/haproxy #base/ntp -#ldap/ldapscripts +ldap/ldapscripts networking/net-tools #filesystem/drbd/drbd-tools #database/mariadb #database/python-psycopg2 base/dnsmasq -#filesystem/parted +filesystem/parted #security/python-keyring -#grub/grub2 +grub/grub2 #ceph/ceph bmc/Redfishtool #virt/kvm-timer-advance