From f0d6b2d20955d79615813e01a66dc4d696829a47 Mon Sep 17 00:00:00 2001 From: wrider Date: Tue, 26 Nov 2019 21:27:33 -0500 Subject: [PATCH] Fix sed in-place Change-Id: Ibdaff82f97ac6614bdceb32fd130ec3d13194eda Signed-off-by: wrider --- ric-infra/00-Kubernetes/bin/gen-cloud-init.sh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/ric-infra/00-Kubernetes/bin/gen-cloud-init.sh b/ric-infra/00-Kubernetes/bin/gen-cloud-init.sh index 55b1bc37..6722b7e8 100755 --- a/ric-infra/00-Kubernetes/bin/gen-cloud-init.sh +++ b/ric-infra/00-Kubernetes/bin/gen-cloud-init.sh @@ -129,21 +129,21 @@ envsubst '${__RUNRICENV_GERRIT_HOST__} ${__RUNRICENV_HELMREPO_PASS__}' < "$TMPL" > "$filename" # fill values that are supplied by Heat stack deployment process as much as we can -sed -i "" -e "s/__docker_version__/${INFRA_DOCKER_VERSION}/g" "$filename" -sed -i "" -e "s/__k8s_version__/${INFRA_K8S_VERSION}/g" "$filename" -sed -i "" -e "s/__k8s_cni_version__/${INFRA_CNI_VERSION}/g" "$filename" -sed -i "" -e "s/__helm_version__/${INFRA_HELM_VERSION}/g" "$filename" -sed -i "" -e "s/__k8s_mst_private_ip_addr__/\$(hostname -I)/g" "$filename" -sed -i "" -e "s/__host_private_ip_addr__/\$(hostname -I)/g" "$filename" -#sed -i "" -e "s/__k8s_mst_floating_ip_addr__/\$(ec2metadata --public-ipv4)/g" "$filename" -sed -i "" -e "s/__k8s_mst_floating_ip_addr__/\$(curl ifconfig.co)/g" "$filename" -sed -i "" -e "s/__stack_name__/\$(hostname)/g" "$filename" +sed -i -e "s/__docker_version__/${INFRA_DOCKER_VERSION}/g" "$filename" +sed -i -e "s/__k8s_version__/${INFRA_K8S_VERSION}/g" "$filename" +sed -i -e "s/__k8s_cni_version__/${INFRA_CNI_VERSION}/g" "$filename" +sed -i -e "s/__helm_version__/${INFRA_HELM_VERSION}/g" "$filename" +sed -i -e "s/__k8s_mst_private_ip_addr__/\$(hostname -I)/g" "$filename" +sed -i -e "s/__host_private_ip_addr__/\$(hostname -I)/g" "$filename" +#sed -i -e "s/__k8s_mst_floating_ip_addr__/\$(ec2metadata --public-ipv4)/g" "$filename" +sed -i -e "s/__k8s_mst_floating_ip_addr__/\$(curl ifconfig.co)/g" "$filename" +sed -i -e "s/__stack_name__/\$(hostname)/g" "$filename" #echo "__mtu__" > /opt/config/mtu.txt #echo "__cinder_volume_id__" > /opt/config/cinder_volume_id.txt # 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" -- 2.16.6