Merge "[fuel] Follow symlink to get k8s config"

diff --git a/jjb/functest/functest-k8.sh b/jjb/functest/functest-k8.sh
index 8561b02..a4d80e1 100755 (executable)
--- a/jjb/functest/functest-k8.sh
+++ b/jjb/functest/functest-k8.sh
@@ -24,7 +24,7 @@ elif [[ ${INSTALLER_TYPE} == 'fuel' ]]; then
     admin_conf_file_vol="-v ${HOME}/admin.conf:/root/.kube/config"
     KUBE_MASTER_URL=$(awk '/server:/ {print $2}' ${HOME}/admin.conf | grep -Fv localhost)
     KUBE_MASTER_IP=$(echo $KUBE_MASTER_URL | grep -Po '(\d+\.){3}\d+')
-    for k in KUBERNETES_PROVIDER KUBE_MASTER_URL KUBE_MASTER_IP; do
+    for k in KUBE_MASTER_URL KUBE_MASTER_IP; do
         echo "export $k=${!k}" >> $rc_file
     done
 else

diff --git a/utils/fetch_k8_conf.sh b/utils/fetch_k8_conf.sh
index b3be0d6..e5e237d 100755 (executable)
--- a/utils/fetch_k8_conf.sh
+++ b/utils/fetch_k8_conf.sh
@@ -61,7 +61,7 @@ elif [ "$installer_type" == "joid" ]; then
     info "Do nothing, config file has been provided in $HOME/joid_config/config for joid"
 elif [ "$installer_type" == "fuel" ]; then
     info "Getting kubernetes config ..."
-    docker cp fuel:/opt/kubernetes.config $dest_path
+    docker cp -L fuel:/opt/kubernetes.config $dest_path
 else
     error "Installer $installer_type is not supported by this script"
 fi