diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2019-03-22 16:20:45 +0400 |
|---|---|---|
| committer | Michael Polenchuk <mpolenchuk@mirantis.com> | 2019-03-22 19:04:17 +0400 |
| commit | 1a28b61ccb46ee45dfee6e38fa29aff5c76cb69c (patch) | |
| tree | ca6751c6372e7c380b3b30f882667e2adf3f51cc | |
| parent | 7486614fbc3e92820c8627bdb6bd7eb252b2ab49 (diff) | |
[fuel] Handle kubernetes config
Change-Id: I87b7d74b22341d9c091c16436a9d4a6cfce173d5
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
| -rwxr-xr-x | jjb/functest/functest-k8.sh | 7 | ||||
| -rwxr-xr-x | utils/fetch_k8_conf.sh | 3 |
2 files changed, 10 insertions, 0 deletions
diff --git a/jjb/functest/functest-k8.sh b/jjb/functest/functest-k8.sh index 419c4e051..8561b02f3 100755 --- a/jjb/functest/functest-k8.sh +++ b/jjb/functest/functest-k8.sh @@ -20,6 +20,13 @@ if [[ ${INSTALLER_TYPE} == 'compass' ]]; then elif [[ ${INSTALLER_TYPE} == 'joid' && ${BRANCH} == 'master' ]]; then admin_conf_file_vol="-v ${HOME}/joid_config/config:/root/.kube/config" rc_file=${HOME}/joid_config/k8config +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 + echo "export $k=${!k}" >> $rc_file + done else echo "Not supported by other installers yet" exit 1 diff --git a/utils/fetch_k8_conf.sh b/utils/fetch_k8_conf.sh index 32c07f8b6..b3be0d6e1 100755 --- a/utils/fetch_k8_conf.sh +++ b/utils/fetch_k8_conf.sh @@ -59,6 +59,9 @@ if [ "$installer_type" == "compass" ]; then info "Fetch admin.conf successfully" 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 else error "Installer $installer_type is not supported by this script" fi |