From d6ebfea37445f50adaa725425171dba468178220 Mon Sep 17 00:00:00 2001 From: Scott Little Date: Wed, 4 Sep 2019 10:13:48 -0400 Subject: [PATCH] Config file changes for packages being relocated to repo 'utilities' List of relocated subdirectories: ceph/ceph-manager ceph/python-cephclient filesystem/nfscheck logging/logmgmt security/tpm2-openssl-engine security/wrs-ssl tools/collector tools/engtools/hostdata-collectors utilities/build-info utilities/namespace-utils utilities/pci-irq-affinity-agent utilities/platform-util utilities/tis-extensions utilities/update-motd Story: 2006166 Task: 35687 Depends-On: I665dc7fabbfffc798ad57843eb74dca16e7647a3 Depends-On: I840888f0b012e9fb24e72f4e6a46567e6f949df7 Change-Id: I85dda6d09028f57c1fb0f96e4bcd73ab9b9550be Signed-off-by: Scott Little --- centos_guest_image.inc | 2 -- centos_guest_image_rt.inc | 2 -- centos_iso_image.inc | 25 ------------------------- centos_pkg_dirs | 14 -------------- 4 files changed, 43 deletions(-) diff --git a/centos_guest_image.inc b/centos_guest_image.inc index c68985da3..c72cec857 100644 --- a/centos_guest_image.inc +++ b/centos_guest_image.inc @@ -2,8 +2,6 @@ # If these have dependencies, they will be pulled in automatically # -# build-info -build-info # kernel perf diff --git a/centos_guest_image_rt.inc b/centos_guest_image_rt.inc index c98982df3..7990eee28 100644 --- a/centos_guest_image_rt.inc +++ b/centos_guest_image_rt.inc @@ -2,8 +2,6 @@ # If these have dependencies, they will be pulled in automatically # -# build-info -build-info # # Network Drivers diff --git a/centos_iso_image.inc b/centos_iso_image.inc index 211bb18c5..7963fe221 100644 --- a/centos_iso_image.inc +++ b/centos_iso_image.inc @@ -5,16 +5,12 @@ # vm-topology vm-topology -# namespace-utils -namespace-utils # qemu-kvm-ev qemu-kvm-ev qemu-img-ev qemu-kvm-tools-ev -# nfscheck -nfscheck # libvirt libvirt @@ -31,8 +27,6 @@ libvirt-daemon-driver-qemu libvirt-daemon-driver-lxc libvirt-client -# python-cephclient -python-cephclient # python-ryu python2-ryu @@ -44,20 +38,14 @@ python-smartpm # lldpd lldpd -# pci-irq-affinity-agent -pci-irq-affinity-agent # mlx4-config mlx4-config -# wrs-ssl -wrs-ssl # tss2 tss2 -# tpm2-openssl-engine -tpm2-openssl-engine # libtpms libtpms @@ -67,8 +55,6 @@ swtpm swtpm-cuse swtpm-tools -# tis-extensions -tis-extensions # python-3parclient python-3parclient @@ -88,8 +74,6 @@ docker-distribution # helm helm -# logmgmt -logmgmt # filesystem-scripts filesystem-scripts @@ -97,12 +81,7 @@ filesystem-scripts # io-scheduler io-scheduler -# collector -collector -# platform-util -platform-util -platform-util-noncontroller # monitor-tools monitor-tools @@ -163,8 +142,6 @@ drbd-pacemaker drbd-heartbeat drbd-bash-completion -# build-info -build-info # initscripts initscripts @@ -327,8 +304,6 @@ rdma-core mlnx-ofa_kernel-modules mlnx-ofa_kernel-rt-modules -# update-motd -update-motd # python2-ruamel-yaml python2-ruamel-yaml diff --git a/centos_pkg_dirs b/centos_pkg_dirs index 798a66a67..938ca1374 100644 --- a/centos_pkg_dirs +++ b/centos_pkg_dirs @@ -3,7 +3,6 @@ base/initscripts base/initscripts-config base/setup-config base/setup -utilities/namespace-utils base/centos-release-config filesystem/nfs-utils-config base/dhcp @@ -12,21 +11,17 @@ base/openssh base/openssh-config config/facter virt/qemu -filesystem/nfscheck -utilities/update-motd python/python-setuptools virt/libvirt virt/libvirt-python base/lighttpd base/lighttpd-config -ceph/python-cephclient networking/python-ryu python/python-smartpm python/python-voluptuous networking/lldpd logging/logrotate logging/logrotate-config -utilities/pci-irq-affinity-agent security/shim-unsigned security/shim-signed base/sudo @@ -40,10 +35,8 @@ networking/mellanox/mlx4-config networking/openvswitch networking/openvswitch-config base/libevent -security/wrs-ssl security/tss2 security/tpm2-tools -security/tpm2-openssl-engine security/libtpms security/swtpm security/spectre-meltdown-checker @@ -69,7 +62,6 @@ config/puppet-modules/openstack/puppet-horizon-9.5.0 config/puppet-modules/openstack/puppet-keystone-11.3.0 config/puppet-modules/openstack/puppet-openstacklib-11.3.0 config/puppet-modules/openstack/puppet-oslo-11.3.0 -utilities/tis-extensions python/python-eventlet python/python-requests base/systemd @@ -87,7 +79,6 @@ kubernetes/kubernetes kubernetes/docker-distribution kubernetes/etcd kubernetes/helm -logging/logmgmt filesystem/filesystem-scripts config-files/io-scheduler config-files/iptables-config @@ -101,11 +92,8 @@ config-files/rsync-config config-files/pam-config config-files/util-linux-config config-files/docker-config -tools/collector grub/grubby -utilities/platform-util tools/monitor-tools -tools/engtools/hostdata-collectors kernel/kernel-modules/intel-e1000e kernel/kernel-modules/intel-i40evf kernel/kernel-modules/intel-i40e @@ -132,9 +120,7 @@ base/dnsmasq-config filesystem/parted security/python-keyring grub/grub2 -utilities/build-info ceph/ceph -ceph/ceph-manager bmc/Redfishtool virt/kvm-timer-advance requests-toolbelt