From ff4433cefe0d58450be287c62aa935e5c869fad2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix-Antoine=20Fortin?= Date: Fri, 14 Oct 2022 14:34:18 -0400 Subject: [PATCH 01/10] Implement sysprep sssd-db-log in prepare4image.sh --- site/profile/files/base/prepare4image.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/site/profile/files/base/prepare4image.sh b/site/profile/files/base/prepare4image.sh index b27371ba7..3971d37f9 100644 --- a/site/profile/files/base/prepare4image.sh +++ b/site/profile/files/base/prepare4image.sh @@ -8,6 +8,8 @@ systemctl disable slurmd &> /dev/null || true systemctl disable consul &> /dev/null || true systemctl disable consul-template &> /dev/null || true /sbin/ipa-client-install -U --uninstall +rm -f /var/lib/sss/db/* +rm -f /var/log/sssd/* rm -rf /etc/puppetlabs rm /opt/consul/node-id /opt/consul/checkpoint-signature /opt/consul/serf/local.snapshot grep nfs /etc/fstab | cut -f 2 | xargs umount From 36eb8d5a70f584a80258b5f218fa290e9d1c74cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix-Antoine=20Fortin?= Date: Fri, 14 Oct 2022 14:37:29 -0400 Subject: [PATCH 02/10] Implement sysprep tmp-files in prepare4image.sh --- site/profile/files/base/prepare4image.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/site/profile/files/base/prepare4image.sh b/site/profile/files/base/prepare4image.sh index 3971d37f9..a1cea2b64 100644 --- a/site/profile/files/base/prepare4image.sh +++ b/site/profile/files/base/prepare4image.sh @@ -23,4 +23,6 @@ if [ -f /etc/cloud/cloud-init.disabled ]; then systemctl disable cloud-init fi cloud-init clean --logs +rm -rf /tmp/* +rm -rf /var/tmp/* halt -p \ No newline at end of file From a7152f9ecfd9781a48dee22837ad6dca3de3e5ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix-Antoine=20Fortin?= Date: Fri, 14 Oct 2022 14:47:42 -0400 Subject: [PATCH 03/10] Implement kerberos-hostkeytab in prepare4image.sh Also add comments --- site/profile/files/base/prepare4image.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/site/profile/files/base/prepare4image.sh b/site/profile/files/base/prepare4image.sh index a1cea2b64..116d8fb20 100644 --- a/site/profile/files/base/prepare4image.sh +++ b/site/profile/files/base/prepare4image.sh @@ -8,8 +8,6 @@ systemctl disable slurmd &> /dev/null || true systemctl disable consul &> /dev/null || true systemctl disable consul-template &> /dev/null || true /sbin/ipa-client-install -U --uninstall -rm -f /var/lib/sss/db/* -rm -f /var/log/sssd/* rm -rf /etc/puppetlabs rm /opt/consul/node-id /opt/consul/checkpoint-signature /opt/consul/serf/local.snapshot grep nfs /etc/fstab | cut -f 2 | xargs umount @@ -23,6 +21,16 @@ if [ -f /etc/cloud/cloud-init.disabled ]; then systemctl disable cloud-init fi cloud-init clean --logs + +# sysprep kerberos-hostkeytab +rm -f /etc/krb5.keytab + +# sysprep sssd-db-log +rm -f /var/lib/sss/db/* +rm -f /var/log/sssd/* + +# sysprep tmp-files rm -rf /tmp/* rm -rf /var/tmp/* + halt -p \ No newline at end of file From 41c14063dfb2e7e1e79441177bf76d5cbaa9d7a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix-Antoine=20Fortin?= Date: Fri, 14 Oct 2022 14:51:00 -0400 Subject: [PATCH 04/10] Implement ssh-userdir in prepare4image.sh --- site/profile/files/base/prepare4image.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/site/profile/files/base/prepare4image.sh b/site/profile/files/base/prepare4image.sh index 116d8fb20..0b4c236ef 100644 --- a/site/profile/files/base/prepare4image.sh +++ b/site/profile/files/base/prepare4image.sh @@ -25,6 +25,9 @@ cloud-init clean --logs # sysprep kerberos-hostkeytab rm -f /etc/krb5.keytab +# sysprep ssh-userdir +find / -maxdepth 2 -name .ssh -type d -exec rm -rf {} \; + # sysprep sssd-db-log rm -f /var/lib/sss/db/* rm -f /var/log/sssd/* From 3808c27e9ac8e6121c6fd1af8c5de0af5fd38a11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix-Antoine=20Fortin?= Date: Fri, 14 Oct 2022 14:54:12 -0400 Subject: [PATCH 05/10] Implement udev-persistent-net in prepare4image.sh --- site/profile/files/base/prepare4image.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/site/profile/files/base/prepare4image.sh b/site/profile/files/base/prepare4image.sh index 0b4c236ef..60f4896d4 100644 --- a/site/profile/files/base/prepare4image.sh +++ b/site/profile/files/base/prepare4image.sh @@ -36,4 +36,7 @@ rm -f /var/log/sssd/* rm -rf /tmp/* rm -rf /var/tmp/* +# sysprep udev-persistent-net +rm -f /etc/udev/rules.d/70-persistent-net.rules + halt -p \ No newline at end of file From 05343ccf8bc250817622fe009212cbbf1e3814d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix-Antoine=20Fortin?= Date: Fri, 14 Oct 2022 14:56:36 -0400 Subject: [PATCH 06/10] Implement sysprep ssh-hostkeys in prepare4image.sh --- site/profile/files/base/prepare4image.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/site/profile/files/base/prepare4image.sh b/site/profile/files/base/prepare4image.sh index 60f4896d4..fed18c0fb 100644 --- a/site/profile/files/base/prepare4image.sh +++ b/site/profile/files/base/prepare4image.sh @@ -25,6 +25,9 @@ cloud-init clean --logs # sysprep kerberos-hostkeytab rm -f /etc/krb5.keytab +# sysprep ssh-hostkeys +rm -f /etc/ssh/*_host_* + # sysprep ssh-userdir find / -maxdepth 2 -name .ssh -type d -exec rm -rf {} \; From b650f012e4057146fa2851804bcc28af537a9e71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix-Antoine=20Fortin?= Date: Fri, 14 Oct 2022 14:58:20 -0400 Subject: [PATCH 07/10] Implement sysprep rpm-db in prepare4image.sh --- site/profile/files/base/prepare4image.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/site/profile/files/base/prepare4image.sh b/site/profile/files/base/prepare4image.sh index fed18c0fb..e44e79ed8 100644 --- a/site/profile/files/base/prepare4image.sh +++ b/site/profile/files/base/prepare4image.sh @@ -25,6 +25,9 @@ cloud-init clean --logs # sysprep kerberos-hostkeytab rm -f /etc/krb5.keytab +# sysprep rpm-db +rm -f /var/lib/rpm/__db.* + # sysprep ssh-hostkeys rm -f /etc/ssh/*_host_* From 01376456c5d1b62241f40f4aced7ec104c3c2917 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix-Antoine=20Fortin?= Date: Fri, 14 Oct 2022 15:02:36 -0400 Subject: [PATCH 08/10] Implement sysprep machine-id in prepare4image.sh --- site/profile/files/base/prepare4image.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/site/profile/files/base/prepare4image.sh b/site/profile/files/base/prepare4image.sh index e44e79ed8..94ac82ea3 100644 --- a/site/profile/files/base/prepare4image.sh +++ b/site/profile/files/base/prepare4image.sh @@ -22,6 +22,9 @@ if [ -f /etc/cloud/cloud-init.disabled ]; then fi cloud-init clean --logs +# sysprep machine-id +rm -f /etc/machine-id + # sysprep kerberos-hostkeytab rm -f /etc/krb5.keytab From f8f2c399413716a8d39c511cb01c50d0924cfdf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix-Antoine=20Fortin?= Date: Fri, 14 Oct 2022 15:10:13 -0400 Subject: [PATCH 09/10] Implement sysprep net-hwaddr in prepare4image.sh --- site/profile/files/base/prepare4image.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/site/profile/files/base/prepare4image.sh b/site/profile/files/base/prepare4image.sh index 94ac82ea3..adbf17b2b 100644 --- a/site/profile/files/base/prepare4image.sh +++ b/site/profile/files/base/prepare4image.sh @@ -25,6 +25,9 @@ cloud-init clean --logs # sysprep machine-id rm -f /etc/machine-id +# sysprep net-hwaddr +sed -i '/HWADDR/d' /etc/sysconfig/network-scripts/ifcfg-* || true + # sysprep kerberos-hostkeytab rm -f /etc/krb5.keytab From cd19036915e5fe3ce82f2cd7722894f84af2240f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix-Antoine=20Fortin?= Date: Fri, 14 Oct 2022 15:12:30 -0400 Subject: [PATCH 10/10] Implement sysprep package-manager-cache in prepare4image.sh --- site/profile/files/base/prepare4image.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/site/profile/files/base/prepare4image.sh b/site/profile/files/base/prepare4image.sh index adbf17b2b..fe3c12112 100644 --- a/site/profile/files/base/prepare4image.sh +++ b/site/profile/files/base/prepare4image.sh @@ -22,14 +22,17 @@ if [ -f /etc/cloud/cloud-init.disabled ]; then fi cloud-init clean --logs +# sysprep kerberos-hostkeytab +rm -f /etc/krb5.keytab + # sysprep machine-id rm -f /etc/machine-id # sysprep net-hwaddr sed -i '/HWADDR/d' /etc/sysconfig/network-scripts/ifcfg-* || true -# sysprep kerberos-hostkeytab -rm -f /etc/krb5.keytab +# sysprep package-manager-cache +rm -rf /var/cache/{yum,dnf}/* # sysprep rpm-db rm -f /var/lib/rpm/__db.*