diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2019-03-29 12:39:28 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2019-03-29 12:39:28 +0000 |
| commit | f0199e263cdde2b09b7a00eed071e877a747ef27 (patch) | |
| tree | a8965c1a3e06bbb4a67ef0129e0de9dfbcbfe79a | |
| parent | 77cefc74573b40f7c3125a3738bc931b10573323 (diff) | |
| parent | 2b65471f6b3f7684f4f9f66dd338d13a93e7b852 (diff) | |
Merge "[fuel] Follow symlink to get k8s config"
| -rwxr-xr-x | jjb/functest/functest-k8.sh | 2 | ||||
| -rwxr-xr-x | utils/fetch_k8_conf.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/jjb/functest/functest-k8.sh b/jjb/functest/functest-k8.sh index 8561b02f3..a4d80e10b 100755 --- 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 b3be0d6e1..e5e237d03 100755 --- 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 |