X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=tools%2Fk8s%2Fbin%2Fgen-cloud-init.sh;h=42ecff411a50ee7e05d15eaca867027ce180b008;hb=866a34f4a876d61246b67ee6fc9ec066c7960ad2;hp=d02ec1dac945e3d4354d151237c243f7de31530f;hpb=0bb98e2a804addfb15cdc7b7c42141d689166079;p=it%2Fdep.git diff --git a/tools/k8s/bin/gen-cloud-init.sh b/tools/k8s/bin/gen-cloud-init.sh index d02ec1da..42ecff41 100755 --- a/tools/k8s/bin/gen-cloud-init.sh +++ b/tools/k8s/bin/gen-cloud-init.sh @@ -33,7 +33,7 @@ usage() { DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )" set -a -RCS="$(find $DIR/../etc -type f -maxdepth 1)" +RCS="$(find $DIR/../etc -maxdepth 1 -type f)" for RC in $RCS; do echo "reading in values in $RC" source $RC @@ -144,8 +144,11 @@ sed -i -e "s/__stack_name__/\$(hostname)/g" "$filename" # because cloud init user data has a 16kB limit, remove all comment lines to save space. # except for the #! line -sed -i -e '/^[ \t]*#[^!]/d' "$filename" +sed -i -e '/^[ \t]*#[^!]/d' "$filename" chmod +x "$filename" -mv "$filename" ./k8s-1node-cloud-init.sh +K8SV=$(echo ${INFRA_K8S_VERSION} | cut -f 1-2 -d '.' | sed -e 's/\./_/g') +HV=$(echo ${INFRA_HELM_VERSION} | cut -f 1-2 -d '.' | sed -e 's/\./_/g') +DV=$(echo ${INFRA_DOCKER_VERSION} | cut -f 1-2 -d '.' | sed -e 's/\./_/g') +mv "$filename" ./k8s-1node-cloud-init-k_${K8SV:-cur}-h_${HV:-cur}-d_${DV:-cur}.sh