From e9e284986fc96e8686b1032ecedb42716a2927a8 Mon Sep 17 00:00:00 2001 From: Markus Hilger Date: Tue, 10 Nov 2026 22:25:09 +0100 Subject: [PATCH] Add post.custom to EL diskless profiles, drop firstboot tls copy post.sh runs post.custom, which the profiles lacked, so every install to disk logged a failed download. firstboot.sh copied /etc/confluent/tls/*.pem, which diskless nodes never have: installimage already adds the confluent CA to the ca-trust anchors. --- .../el10-diskless/profiles/default/scripts/post.custom | 1 + .../el7-diskless/profiles/default/scripts/firstboot.sh | 2 -- .../el7-diskless/profiles/default/scripts/post.custom | 4 ++++ .../el8-diskless/profiles/default/scripts/firstboot.sh | 1 - .../el8-diskless/profiles/default/scripts/post.custom | 4 ++++ .../el9-diskless/profiles/default/scripts/firstboot.sh | 1 - .../el9-diskless/profiles/default/scripts/post.custom | 4 ++++ 7 files changed, 13 insertions(+), 4 deletions(-) create mode 120000 confluent_osdeploy/el10-diskless/profiles/default/scripts/post.custom create mode 100644 confluent_osdeploy/el7-diskless/profiles/default/scripts/post.custom create mode 100644 confluent_osdeploy/el8-diskless/profiles/default/scripts/post.custom create mode 100644 confluent_osdeploy/el9-diskless/profiles/default/scripts/post.custom diff --git a/confluent_osdeploy/el10-diskless/profiles/default/scripts/post.custom b/confluent_osdeploy/el10-diskless/profiles/default/scripts/post.custom new file mode 120000 index 00000000..052e5b41 --- /dev/null +++ b/confluent_osdeploy/el10-diskless/profiles/default/scripts/post.custom @@ -0,0 +1 @@ +../../../../el9-diskless/profiles/default/scripts/post.custom \ No newline at end of file diff --git a/confluent_osdeploy/el7-diskless/profiles/default/scripts/firstboot.sh b/confluent_osdeploy/el7-diskless/profiles/default/scripts/firstboot.sh index 2bab4136..3e91ce1f 100644 --- a/confluent_osdeploy/el7-diskless/profiles/default/scripts/firstboot.sh +++ b/confluent_osdeploy/el7-diskless/profiles/default/scripts/firstboot.sh @@ -24,8 +24,6 @@ done if [ ! -f /etc/confluent/firstboot.ran ]; then touch /etc/confluent/firstboot.ran - cat /etc/confluent/tls/*.pem >> /etc/pki/tls/certs/ca-bundle.crt - run_remote firstboot.custom # Firstboot scripts may be placed into firstboot.d, e.g. firstboot.d/01-firstaction.sh, firstboot.d/02-secondaction.sh run_remote_parts firstboot.d diff --git a/confluent_osdeploy/el7-diskless/profiles/default/scripts/post.custom b/confluent_osdeploy/el7-diskless/profiles/default/scripts/post.custom new file mode 100644 index 00000000..eea34051 --- /dev/null +++ b/confluent_osdeploy/el7-diskless/profiles/default/scripts/post.custom @@ -0,0 +1,4 @@ +. /etc/confluent/functions +# This is a convenient place to keep customizations separate from modifying the stock scripts +# While modification of the stock scripts is fine, it may be easier to rebase to a newer +# stock profile if the '.custom' files are used. diff --git a/confluent_osdeploy/el8-diskless/profiles/default/scripts/firstboot.sh b/confluent_osdeploy/el8-diskless/profiles/default/scripts/firstboot.sh index 922dbcda..08e08003 100644 --- a/confluent_osdeploy/el8-diskless/profiles/default/scripts/firstboot.sh +++ b/confluent_osdeploy/el8-diskless/profiles/default/scripts/firstboot.sh @@ -24,7 +24,6 @@ done if [ ! -f /etc/confluent/firstboot.ran ]; then touch /etc/confluent/firstboot.ran - cat /etc/confluent/tls/*.pem >> /etc/pki/tls/certs/ca-bundle.crt confluentpython /root/confignet rm /root/confignet run_remote firstboot.custom diff --git a/confluent_osdeploy/el8-diskless/profiles/default/scripts/post.custom b/confluent_osdeploy/el8-diskless/profiles/default/scripts/post.custom new file mode 100644 index 00000000..eea34051 --- /dev/null +++ b/confluent_osdeploy/el8-diskless/profiles/default/scripts/post.custom @@ -0,0 +1,4 @@ +. /etc/confluent/functions +# This is a convenient place to keep customizations separate from modifying the stock scripts +# While modification of the stock scripts is fine, it may be easier to rebase to a newer +# stock profile if the '.custom' files are used. diff --git a/confluent_osdeploy/el9-diskless/profiles/default/scripts/firstboot.sh b/confluent_osdeploy/el9-diskless/profiles/default/scripts/firstboot.sh index 2c5bcfd3..a68fb881 100644 --- a/confluent_osdeploy/el9-diskless/profiles/default/scripts/firstboot.sh +++ b/confluent_osdeploy/el9-diskless/profiles/default/scripts/firstboot.sh @@ -32,7 +32,6 @@ if [ ! -f /etc/confluent/firstboot.ran ]; then touch /etc/confluent/firstboot.ran - cat /etc/confluent/tls/*.pem >> /etc/pki/tls/certs/ca-bundle.crt confluentpython /root/confignet rm /root/confignet run_remote firstboot.custom diff --git a/confluent_osdeploy/el9-diskless/profiles/default/scripts/post.custom b/confluent_osdeploy/el9-diskless/profiles/default/scripts/post.custom new file mode 100644 index 00000000..eea34051 --- /dev/null +++ b/confluent_osdeploy/el9-diskless/profiles/default/scripts/post.custom @@ -0,0 +1,4 @@ +. /etc/confluent/functions +# This is a convenient place to keep customizations separate from modifying the stock scripts +# While modification of the stock scripts is fine, it may be easier to rebase to a newer +# stock profile if the '.custom' files are used.