diff --git a/confluent_osdeploy/confluent_osdeploy.spec.tmpl b/confluent_osdeploy/confluent_osdeploy.spec.tmpl index e63b2edb..7819d590 100644 --- a/confluent_osdeploy/confluent_osdeploy.spec.tmpl +++ b/confluent_osdeploy/confluent_osdeploy.spec.tmpl @@ -20,24 +20,25 @@ This contains support utilities for enabling deployment of x86_64 architecture s %setup -n confluent_osdeploy %build -mkdir -p el9/opt/confluent/bin -mkdir -p el9/stateless-bin +mkdir -p el9bin/opt/confluent/bin +mkdir -p el9bin/stateless-bin mkdir -p opt/confluent/bin mkdir -p stateless-bin cd utils podman run --privileged --rm -v $(pwd):/buildutils -i -t fedorabuilder make -C /buildutils -cp confluent_imginfo copernicus clortho autocons ../el9/opt/confluent/bin +cp confluent_imginfo copernicus clortho autocons ../el9bin/opt/confluent/bin cp start_root urlmount ../el9stateless-bin/ make clean make all cp confluent_imginfo copernicus clortho autocons ../opt/confluent/bin cp start_root urlmount ../stateless-bin/ cd .. +ln -s el8 el9 for os in rhvh4 el7 genesis el8 suse15 ubuntu20.04 coreos el9; do mkdir ${os}out cd ${os}out - if [ -d ../${os} ]; then - cp -a ../${os}/opt . + if [ -d ../${os}bin ]; then + cp -a ../${os}bin/opt . else cp -a ../opt . fi @@ -50,15 +51,15 @@ done for os in el8 suse15 el9; do mkdir ${os}disklessout cd ${os}disklessout - if [ -d ../${os} ]; then - cp -a ../${os}/opt . + if [ -d ../${os}bin ]; then + cp -a ../${os}bin/opt . else cp -a ../opt . fi cp -a ../${os}-diskless/initramfs/* . cp -a ../common/* . - if [ -d ../${os} ]; then - cp -a ../${os}/stateless-bin/* opt/confluent/bin + if [ -d ../${os}bin ]; then + cp -a ../${os}bin/stateless-bin/* opt/confluent/bin else cp -a ../stateless-bin/* opt/confluent/bin fi diff --git a/confluent_osdeploy/el8-diskless/initramfs/usr/lib/dracut/hooks/cmdline/10-confluentdiskless.sh b/confluent_osdeploy/el8-diskless/initramfs/usr/lib/dracut/hooks/cmdline/10-confluentdiskless.sh index cb34f4f5..3e35d683 100644 --- a/confluent_osdeploy/el8-diskless/initramfs/usr/lib/dracut/hooks/cmdline/10-confluentdiskless.sh +++ b/confluent_osdeploy/el8-diskless/initramfs/usr/lib/dracut/hooks/cmdline/10-confluentdiskless.sh @@ -134,7 +134,7 @@ while [ $ready = "0" ]; do done tpm2_pcrextend 15:sha256=2fbe96c50dde38ce9cd2764ddb79c216cfbcd3499568b1125450e60c45dd19f2 umask $oldumask -autoconfigmethod=$(grep ipv4_method /etc/confluent/confluent.deploycfg |awk '{print $2}') +autoconfigmethod=$(grep ^ipv4_method: /etc/confluent/confluent.deploycfg |awk '{print $2}') if [ "$autoconfigmethod" = "dhcp" ]; then echo -n "Attempting to use dhcp to bring up $ifname..." dhclient $ifname diff --git a/confluent_osdeploy/el8/initramfs/usr/lib/dracut/hooks/initqueue/01-confluent.sh b/confluent_osdeploy/el8/initramfs/usr/lib/dracut/hooks/initqueue/01-confluent.sh index 323bb52c..92b59dd0 100644 --- a/confluent_osdeploy/el8/initramfs/usr/lib/dracut/hooks/initqueue/01-confluent.sh +++ b/confluent_osdeploy/el8/initramfs/usr/lib/dracut/hooks/initqueue/01-confluent.sh @@ -1,5 +1,16 @@ #!/bin/sh [ -e /tmp/confluent.initq ] && return 0 +function confluentpython() { + if [ -x /usr/libexec/platform-python ]; then + /usr/libexec/platform-python $* + elif [ -x /usr/bin/python3 ]; then + /usr/bin/python3 $* + elif [ -x /usr/bin/python ]; then + /usr/bin/python $* + elif [ -x /usr/bin/python2 ]; then + /usr/bin/python2 $* + fi +} if [ -f /tmp/dd_disk ]; then for dd in $(cat /tmp/dd_disk); do if [ -e $dd ]; then @@ -38,7 +49,7 @@ nodename=$(grep ^NODENAME /etc/confluent/confluent.info|awk '{print $2}') #TODO: blkid --label to find mounted api cat /tls/*.pem > /etc/confluent/ca.pem -/usr/libexec/platform-python /opt/confluent/bin/apiclient /confluent-api/self/deploycfg > /etc/confluent/confluent.deploycfg +confluentpython /opt/confluent/bin/apiclient /confluent-api/self/deploycfg > /etc/confluent/confluent.deploycfg ifidx=$(cat /tmp/confluent.ifidx) ifname=$(ip link |grep ^$ifidx:|awk '{print $2}') ifname=${ifname%:} diff --git a/confluent_osdeploy/el8/profiles/default/scripts/functions b/confluent_osdeploy/el8/profiles/default/scripts/functions index 65fd0ddd..ef91b1c4 100644 --- a/confluent_osdeploy/el8/profiles/default/scripts/functions +++ b/confluent_osdeploy/el8/profiles/default/scripts/functions @@ -6,6 +6,18 @@ function test_mgr() { return 1 } +function confluentpython() { + if [ -x /usr/libexec/platform-python ]; then + /usr/libexec/platform-python $* + elif [ -x /usr/bin/python3 ]; then + /usr/bin/python3 $* + elif [ -x /usr/bin/python ]; then + /usr/bin/python $* + elif [ -x /usr/bin/python2 ]; then + /usr/bin/python2 $* + fi +} + function set_confluent_vars() { if [ -z "$nodename" ]; then nodename=$(grep ^NODENAME: /etc/confluent/confluent.info | awk '{print $2}') @@ -52,7 +64,7 @@ fetch_remote() { source_remote_parts() { confluentscripttmpdir=$(mktemp -d) - scriptlist=$(/usr/libexec/platform-python /etc/confluent/apiclient /confluent-api/self/scriptlist/$1|sed -e 's/^- //') + scriptlist=$(confluentpython /etc/confluent/apiclient /confluent-api/self/scriptlist/$1|sed -e 's/^- //') for script in $scriptlist; do source_remote $1/$script done @@ -61,7 +73,7 @@ source_remote_parts() { run_remote_parts() { confluentscripttmpdir=$(mktemp -d) - scriptlist=$(/usr/libexec/platform-python /etc/confluent/apiclient /confluent-api/self/scriptlist/$1|sed -e 's/^- //') + scriptlist=$(confluentpython /etc/confluent/apiclient /confluent-api/self/scriptlist/$1|sed -e 's/^- //') for script in $scriptlist; do run_remote $1/$script done @@ -130,11 +142,7 @@ run_remote_python() { mkdir -p $(dirname $1) curl -f -sS $curlargs https://$confluent_mgr/confluent-public/os/$confluent_profile/scripts/$1 > $1 if [ $? != 0 ]; then echo "'$*'" failed to download; return 1; fi - if [ -x /usr/libexec/platform-python ]; then - /usr/libexec/platform-python $* - else - /usr/bin/python $* - fi + confluentpython $* retcode=$? echo "'$*' exited with code $retcode" cd - > /dev/null @@ -150,17 +158,12 @@ run_remote_config() { fi echo '---------------------------------------------------------------------------' echo Requesting to run remote configuration for "'$*'" from $confluent_mgr under profile $confluent_profile - if [ -x /usr/libexec/platform-python ]; then - /usr/libexec/platform-python $apiclient /confluent-api/self/remoteconfig/"$*" -d {} - /usr/libexec/platform-python $apiclient /confluent-api/self/remoteconfig/status -w 204 - else - /usr/bin/python $apiclient /confluent-api/self/remoteconfig/"$*" -d {} - /usr/bin/python $apiclient /confluent-api/self/remoteconfig/status -w 204 - fi + confluentpython $apiclient /confluent-api/self/remoteconfig/"$*" -d {} + confluentpython $apiclient /confluent-api/self/remoteconfig/status -w 204 echo echo 'Completed remote configuration' echo '---------------------------------------------------------------------------' return } #If invoked as a command, use the arguments to actually run a function -(return 0 2>/dev/null) || $1 "${@:2}" \ No newline at end of file +(return 0 2>/dev/null) || $1 "${@:2}" diff --git a/confluent_osdeploy/el8/profiles/default/scripts/pre.sh b/confluent_osdeploy/el8/profiles/default/scripts/pre.sh index 438f7927..54b079d0 100644 --- a/confluent_osdeploy/el8/profiles/default/scripts/pre.sh +++ b/confluent_osdeploy/el8/profiles/default/scripts/pre.sh @@ -11,11 +11,22 @@ if [ -f "/run/install/cmdline.d/01-autocons.conf" ]; then consoledev=$(cat /run/install/cmdline.d/01-autocons.conf | sed -e 's!console=!/dev/!' -e 's/,.*//') TMUX= tmux a <> $consoledev >&0 2>&1 & fi +function confluentpython() { + if [ -x /usr/libexec/platform-python ]; then + /usr/libexec/platform-python $* + elif [ -x /usr/bin/python3 ]; then + /usr/bin/python3 $* + elif [ -x /usr/bin/python ]; then + /usr/bin/python $* + elif [ -x /usr/bin/python2 ]; then + /usr/bin/python2 $* + fi +} exec >> /tmp/confluent-pre.log exec 2>> /tmp/confluent-pre.log tail -f /tmp/confluent-pre.log > /dev/tty & logshowpid=$! -/usr/libexec/platform-python /etc/confluent/apiclient >& /dev/null +confluentpython /etc/confluent/apiclient >& /dev/null nicname=$(ip link|grep ^$(cat /tmp/confluent.ifidx): | awk '{print $2}' | awk -F: '{print $1}') nmcli c u $nicname while ip -6 addr | grep tentative > /dev/null; do @@ -76,14 +87,7 @@ fi export confluent_mgr confluent_profile nodename curl -sf https://$confluent_mgr/confluent-public/os/$confluent_profile/scripts/functions > /tmp/functions . /tmp/functions -if [ -e /usr/libexec/platform-python ]; then - python=/usr/libexec/platform-python -elif [ -e /usr/bin/python3 ]; then - python=/usr/byn/python3 -else - python=/usr/bin/python -fi -$python /etc/confluent/apiclient /confluent-public/os/$confluent_profile/kickstart.custom -o /tmp/kickstart.custom +confluentpython /etc/confluent/apiclient /confluent-public/os/$confluent_profile/kickstart.custom -o /tmp/kickstart.custom run_remote pre.custom run_remote_parts pre.d if [ ! -e /tmp/installdisk ]; then diff --git a/confluent_server/confluent/osimage.py b/confluent_server/confluent/osimage.py index 78ebcdb5..9eea2c63 100644 --- a/confluent_server/confluent/osimage.py +++ b/confluent_server/confluent/osimage.py @@ -302,6 +302,12 @@ def check_centos(isoinfo): cat = 'el8' isstream = '_stream' break + elif 'centos-stream-release-9' in entry: + ver = entry.split('-')[3] + arch = entry.split('.')[-2] + cat = 'el9' + isstream = '_stream' + break elif 'centos-linux-release-8' in entry: ver = entry.split('-')[3] arch = entry.split('.')[-2]