From 1d98eee3cc7d4b03d5cee934ca909fba6544dd4e Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com>
Date: Wed, 4 Sep 2019 10:14:26 -0400
Subject: [PATCH] Config file changes  for packages being relocated to repo
 'config-files'

List of relocated subdirectories:

base/centos-release-config
base/dhcp-config
base/dnsmasq-config
base/haproxy-config
base/initscripts-config
base/lighttpd-config
base/net-snmp-config
base/openssh-config
base/setup-config
base/systemd-config
config-files/audit-config
config-files/docker-config
config-files/io-scheduler
config-files/iptables-config
config-files/memcached-custom
config-files/ntp-config
config-files/pam-config
config-files/rsync-config
config-files/shadow-utils-config
config-files/sudo-config
config-files/syslog-ng-config
config-files/util-linux-config
filesystem/filesystem-scripts
filesystem/iscsi-initiator-utils-config
filesystem/nfs-utils-config
ldap/openldap-config
logging/logrotate-config
networking/mellanox/mlx4-config
networking/openvswitch-config

Story: 2006166
Task: 35687
Depends-On: I665dc7fabbfffc798ad57843eb74dca16e7647a3
Depends-On: I14e631137ff5658a54d62ad3d7aa2cd0ffaba6e0
Change-Id: I761b0f76150881c765b70b2ccd255244c754bd5d
Signed-off-by: Scott Little <scott.little@windriver.com>
---
 centos_iso_image.inc | 35 -----------------------------------
 centos_pkg_dirs      | 29 -----------------------------
 2 files changed, 64 deletions(-)

diff --git a/centos_iso_image.inc b/centos_iso_image.inc
index 7d015f092..2988e322d 100644
--- a/centos_iso_image.inc
+++ b/centos_iso_image.inc
@@ -37,8 +37,6 @@ python-smartpm
 lldpd
 
 
-# mlx4-config
-mlx4-config
 
 
 # tss2
@@ -69,11 +67,7 @@ docker-distribution
 helm
 
 
-# filesystem-scripts
-filesystem-scripts
 
-# io-scheduler
-io-scheduler
 
 
 
@@ -137,31 +131,24 @@ drbd-bash-completion
 
 # initscripts
 initscripts
-initscripts-config
 
 # setup
 setup
-setup-config
 
 # nss-pam-ldapd
 nss-pam-ldapd
 
-# centos-release-config
-centos-release-config
 
 # nfs-utils series package
-nfs-utils-config
 
 # dhcp
 dhcp
 dhclient
-dhcp-config
 
 # openssh
 openssh
 openssh-clients
 openssh-server
-openssh-config
 
 # facter
 facter
@@ -177,14 +164,12 @@ python2-libvirt
 
 # lighttpd
 lighttpd
-lighttpd-config
 lighttpd-fastcgi
 lighttpd-mod_geoip
 lighttpd-mod_mysql_vhost
 
 # logrotate
 logrotate
-logrotate-config
 
 # novnc
 novnc
@@ -193,29 +178,19 @@ novnc
 sudo
 
 # config files
-sudo-config
-shadow-utils-config
-ntp-config
-syslog-ng-config
-rsync-config
-pam-config
-docker-config
 
 # net-snmp
 net-snmp-utils
 net-snmp-libs
 net-snmp-python
-net-snmp-config
 
 # openldap
 openldap
-openldap-config
 openldap-servers
 openldap-clients
 
 # openvswitch
 openvswitch
-openvswitch-config
 
 # libevent
 libevent
@@ -224,7 +199,6 @@ libevent
 tpm2-tools
 
 # audit
-audit-config
 
 # kernel
 kernel
@@ -238,14 +212,12 @@ puppet
 
 # systemd
 systemd
-systemd-config
 
 # tboot
 tboot
 
 # memcached
 memcached
-memcached-custom
 
 # kubernetes
 kubernetes
@@ -260,13 +232,9 @@ resource-agents
 
 # haproxy
 haproxy
-haproxy-config
 
-# iscsi-initiator-utils-config
-iscsi-initiator-utils-config
 
 # iptables
-iptables-config
 
 # python-psycopg2
 python-psycopg2
@@ -274,7 +242,6 @@ python-psycopg2
 # dnsmasq
 dnsmasq
 dnsmasq-utils
-dnsmasq-config
 
 # parted
 parted
@@ -300,8 +267,6 @@ mlnx-ofa_kernel-rt-modules
 # python2-ruamel-yaml
 python2-ruamel-yaml
 
-# util-linux-config
-util-linux-config
 
 # redfish tool
 Redfishtool
diff --git a/centos_pkg_dirs b/centos_pkg_dirs
index 4ba206e1b..bd56c0722 100644
--- a/centos_pkg_dirs
+++ b/centos_pkg_dirs
@@ -1,38 +1,26 @@
 base/initscripts
-base/initscripts-config
-base/setup-config
 base/setup
-base/centos-release-config
-filesystem/nfs-utils-config
 base/dhcp
-base/dhcp-config
 base/openssh
-base/openssh-config
 config/facter
 virt/qemu
 python/python-setuptools
 virt/libvirt
 virt/libvirt-python
 base/lighttpd
-base/lighttpd-config
 networking/python-ryu
 python/python-smartpm
 python/python-voluptuous
 networking/lldpd
 logging/logrotate
-logging/logrotate-config
 security/shim-unsigned
 security/shim-signed
 base/sudo
 virt/cloud-init
 base/watchdog
 base/net-snmp
-base/net-snmp-config
 ldap/openldap
-ldap/openldap-config
-networking/mellanox/mlx4-config
 networking/openvswitch
-networking/openvswitch-config
 base/libevent
 security/tss2
 security/tpm2-tools
@@ -64,7 +52,6 @@ config/puppet-modules/openstack/puppet-oslo-11.3.0
 python/python-eventlet
 python/python-requests
 base/systemd
-base/systemd-config
 storage-drivers/python-3parclient
 storage-drivers/python-lefthandclient
 security/tboot
@@ -76,19 +63,6 @@ kubernetes/kubernetes
 kubernetes/docker-distribution
 kubernetes/etcd
 kubernetes/helm
-filesystem/filesystem-scripts
-config-files/io-scheduler
-config-files/iptables-config
-config-files/sudo-config
-config-files/memcached-custom
-config-files/audit-config
-config-files/shadow-utils-config
-config-files/ntp-config
-config-files/syslog-ng-config
-config-files/rsync-config
-config-files/pam-config
-config-files/util-linux-config
-config-files/docker-config
 grub/grubby
 kernel/kernel-modules/intel-e1000e
 kernel/kernel-modules/intel-i40evf
@@ -104,15 +78,12 @@ base/cgcs-users
 base/cluster-resource-agents
 base/libfdt
 base/haproxy
-base/haproxy-config
-filesystem/iscsi-initiator-utils-config
 ldap/ldapscripts
 networking/net-tools
 filesystem/drbd/drbd-tools
 database/mariadb
 database/python-psycopg2
 base/dnsmasq
-base/dnsmasq-config
 filesystem/parted
 security/python-keyring
 grub/grub2