From: Zhe Huang <zhehuang@research.att.com>
Date: Mon, 17 Jun 2019 20:51:38 +0000 (+0000)
Subject: Merge "Use application.properties from YAML in values"
X-Git-Tag: 0.0.2~95
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=8d90c3527c54ea27c61feecbbee2f1c09169e298;hp=3d542731ce43e665288f769989f60be45cabb49a;p=it%2Fdep.git

Merge "Use application.properties from YAML in values"
---

diff --git a/ric-infra/00-Kubernetes/bin/gen-cloud-init.sh b/ric-infra/00-Kubernetes/bin/gen-cloud-init.sh
index b0270c40..61603ba8 100755
--- a/ric-infra/00-Kubernetes/bin/gen-cloud-init.sh
+++ b/ric-infra/00-Kubernetes/bin/gen-cloud-init.sh
@@ -126,7 +126,8 @@ sed -e "s/__k8s_cni_version__/${INFRA_CNI_VERSION}/g" "$filename" > tmp && mv tm
 sed -e "s/__helm_version__/${INFRA_HELM_VERSION}/g" "$filename" > tmp && mv tmp "$filename"
 sed -e "s/__k8s_mst_private_ip_addr__/\$(hostname -I)/g" "$filename" > tmp && mv tmp "$filename"
 sed -e "s/__host_private_ip_addr__/\$(hostname -I)/g" "$filename" > tmp && mv tmp "$filename"
-sed -e "s/__k8s_mst_floating_ip_addr__/\$(ec2metadata --public-ipv4)/g" "$filename" > tmp && mv tmp "$filename" 
+#sed -e "s/__k8s_mst_floating_ip_addr__/\$(ec2metadata --public-ipv4)/g" "$filename" > tmp && mv tmp "$filename" 
+sed -e "s/__k8s_mst_floating_ip_addr__/\$(curl ifconfig.co)/g" "$filename" > tmp && mv tmp "$filename" 
 sed -e "s/__stack_name__/\$(hostname)/g" "$filename" > tmp && mv tmp "$filename"
 #echo "__mtu__" > /opt/config/mtu.txt
 #echo "__cinder_volume_id__" > /opt/config/cinder_volume_id.txt