Fix UEB IPs when running a K8S cluster

[oom.git] / kubernetes / config / docker / init / config-init.sh

diff --git a/kubernetes/config/docker/init/config-init.sh b/kubernetes/config/docker/init/config-init.sh
index 8eebab1..cdf2d53 100755 (executable)
--- a/kubernetes/config/docker/init/config-init.sh
+++ b/kubernetes/config/docker/init/config-init.sh
@@ -179,18 +179,12 @@ SED_CONFIG_STRINGS=( \
   "s/OPENSTACK_ENCRYPTED_PASSWORD_HERE/${OPENSTACK_API_ENCRYPTED_KEY}/g" \
   "s/VNF_OPENSTACK_OAM_NETWORK_ID_HERE/$OPENSTACK_OAM_NETWORK_ID/g" \
   "s/VNF_OPENSTACK_PUBLIC_ID_HERE/$OPENSTACK_PUBLIC_NETWORK_ID/g" \
-  "s/VNF_OPENSTACK_FLAVOR/$OPENSTACK_FLAVOR/g" \
-  "s/VNF_OPENSTACK_IMAGE/$OPENSTACK_IMAGE/g" \
+  "s/VNF_OPENSTACK_FLAVOR_HERE/$OPENSTACK_FLAVOR/g" \
+  "s/VNF_OPENSTACK_IMAGE_HERE/$OPENSTACK_IMAGE/g" \
 )
 SED_CONFIG_STRING=$(concat_array "${SED_CONFIG_STRINGS[@]}")
 find $SED_CONFIG_PATHS -type f -exec sed -i -e "${SED_CONFIG_STRING}" {} \;
 
-# Instal kubectl commands
-apt -y install curl
-curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl
-chmod +x ./kubectl
-mv ./kubectl /usr/local/bin/kubectl
-
 if [ "$DEPLOY_DCAE" = "true" ]
 then
     SED_CONFIG_PATHS="/config-init/$NAMESPACE/dcaegen2/heat/"
@@ -252,8 +246,11 @@ then
     if [ "$DNSAAS_PROXY_ENABLE" = "true" ]
     then
         find /config-init/$NAMESPACE/dcaegen2/heat/ -type f -exec sed -i -e "s,DCAE_FINAL_KEYSTONE_URL_HERE,$DCAE_PROXIED_KEYSTONE_URL,g" {} \;
-    else
+    elif [ "$IS_SAME_OPENSTACK_AS_VNF" = "false" ]
+    then
         find /config-init/$NAMESPACE/dcaegen2/heat/ -type f -exec sed -i -e "s,DCAE_FINAL_KEYSTONE_URL_HERE,$DCAE_OS_KEYSTONE_URL/$DCAE_OS_API_VERSION,g" {} \;
+    else
+        find /config-init/$NAMESPACE/dcaegen2/heat/ -type f -exec sed -i -e "s,DCAE_FINAL_KEYSTONE_URL_HERE,$OPENSTACK_KEYSTONE_URL/$OPENSTACK_API_VERSION,g" {} \;
     fi
 fi
 
@@ -270,8 +267,8 @@ UEB_ADDR_IP=$(kubectl get nodes -o jsonpath='{ $.items[*].status.addresses[?(@.t
 # Also, this list has to be comma seperated.
 if [ `echo $UEB_ADDR_IP | wc -w` -gt "1" ]
 then
-    UEB_ADDR_IP_COMMA_AND_QUOTE_SEPERATED=`echo $UEB_ADDR_IP | sed 's/ /","/'`
-    UEB_ADDR_IP_COMMA_SEPERATED=`echo $UEB_ADDR_IP | sed 's/ /,/'`
+    UEB_ADDR_IP_COMMA_AND_QUOTE_SEPERATED=`echo $UEB_ADDR_IP | sed 's/ /","/g'`
+    UEB_ADDR_IP_COMMA_SEPERATED=`echo $UEB_ADDR_IP | sed 's/ /,/g'`
 else
     UEB_ADDR_IP_COMMA_AND_QUOTE_SEPERATED="$UEB_ADDR_IP\",\"$UEB_ADDR_IP"
     UEB_ADDR_IP_COMMA_SEPERATED="$UEB_ADDR_IP,$UEB_ADDR_IP"