Commit 82981165 authored by garciadeblas's avatar garciadeblas
Browse files

Update installer shell scripts to set env vars after getopts 



Change-Id: I656df0d03d986928768d0f108719cf16002c8f40
Signed-off-by: default avatargarciadeblas <gerardo.garciadeblas@telefonica.com>
parent ca6cf4a0

installers/install_cluster_addons.sh

+13 −10
Original line number Diff line number Diff line
@@ -15,11 +15,6 @@ 


set +eux



INSTALL_STORAGECLASS=""

INSTALL_METALLB=""

INSTALL_CERTMANAGER=""

INSTALL_NGINX=""



function install_k8s_storageclass() {

    [ -z "${DEBUG_INSTALL}" ] || DEBUG beginning of function

    # Openebs versions can be found here: https://github.com/openebs/openebs/releases
@@ -257,14 +252,22 @@ while getopts ":D:d:i:-: " o; do 
    esac

done



DEBUG_INSTALL=${DEBUG_INSTALL:-}

DEFAULT_IP=${DEFAULT_IP:-}

OSM_DEVOPS=${OSM_DEVOPS:-}

OSM_CLUSTER_WORK_DIR=${OSM_CLUSTER_WORK_DIR:-}

INSTALL_STORAGECLASS=${INSTALL_STORAGECLASS:-}

INSTALL_METALLB=${INSTALL_METALLB:-}

INSTALL_CERTMANAGER=${INSTALL_CERTMANAGER:-}

INSTALL_NGINX=${INSTALL_NGINX:-}

echo "DEBUG_INSTALL=${DEBUG_INSTALL}"

echo "DEFAULT_IP=${DEFAULT_IP}"

echo "OSM_DEVOPS=${OSM_DEVOPS}"

echo "OSM_CLUSTER_WORK_DIR=${OSM_CLUSTER_WORK_DIR}"



source $OSM_DEVOPS/common/logging

source $OSM_DEVOPS/common/track



echo "DEBUG_INSTALL=${DEBUG_INSTALL:-}"

echo "DEFAULT_IP=${DEFAULT_IP:-}"

echo "OSM_DEVOPS=${OSM_DEVOPS:-}"

echo "OSM_CLUSTER_WORK_DIR=${OSM_CLUSTER_WORK_DIR:-}"



if [ -n "${INSTALL_STORAGECLASS}" ]; then

    install_k8s_storageclass

    track k8scluster k8s_storageclass_ok

installers/install_docker_ce.sh

+5 −6
Original line number Diff line number Diff line
@@ -116,9 +116,6 @@ EOF" 
    return 0

}



OSM_BEHIND_PROXY=""

DOCKER_PROXY_URL=""



while getopts ":D:p:-: P" o; do

    case "${o}" in

        D)
@@ -149,12 +146,14 @@ while getopts ":D:p:-: P" o; do 
    esac

done



source $OSM_DEVOPS/common/logging



DEBUG_INSTALL=${DEBUG_INSTALL:-}

DOCKER_PROXY_URL=${DOCKER_PROXY_URL:-}

OSM_BEHIND_PROXY=${OSM_BEHIND_PROXY:-}

echo "DEBUG_INSTALL=$DEBUG_INSTALL"

echo "DOCKER_PROXY_URL=$DOCKER_PROXY_URL"

echo "OSM_BEHIND_PROXY=$OSM_BEHIND_PROXY"

echo "USER=$USER"



install_docker_ce

source $OSM_DEVOPS/common/logging



install_docker_ce

installers/install_helm_client.sh

+5 −4
Original line number Diff line number Diff line
@@ -63,11 +63,12 @@ while getopts ":D:-: " o; do 
    esac

done



source $OSM_DEVOPS/common/logging

source $OSM_DEVOPS/common/track



DEBUG_INSTALL=${DEBUG_INSTALL:-}

OSM_DEVOPS=${OSM_DEVOPS:-}

echo "DEBUG_INSTALL=$DEBUG_INSTALL"

echo "DEFAULT_IP=$DEFAULT_IP"

echo "OSM_DEVOPS=$OSM_DEVOPS"



source $OSM_DEVOPS/common/logging

source $OSM_DEVOPS/common/track



install_helm_client

installers/install_k3s_cluster.sh

+6 −7
Original line number Diff line number Diff line
@@ -138,10 +138,6 @@ function save_kubeconfig() { 
}



# main

DEFAULT_IP="127.0.0.1"

OSM_DEVOPS="/usr/share/osm-devops"

DEBUG_INSTALL=""



while getopts ":D:i:-: " o; do

    case "${o}" in

        i)
@@ -169,14 +165,17 @@ while getopts ":D:i:-: " o; do 
    esac

done



source $OSM_DEVOPS/common/logging

source $OSM_DEVOPS/common/track



DEBUG_INSTALL=${DEBUG_INSTALL:-}

DEFAULT_IP=${DEFAULT_IP:-"127.0.0.1"}

OSM_DEVOPS=${OSM_DEVOPS:-"/usr/share/osm-devops"}

echo "DEBUG_INSTALL=${DEBUG_INSTALL}"

echo "DEFAULT_IP=${DEFAULT_IP}"

echo "OSM_DEVOPS=${OSM_DEVOPS}"

echo "HOME=$HOME"



source $OSM_DEVOPS/common/logging

source $OSM_DEVOPS/common/track



install_k3s

track k8scluster k3s_install_ok

check_for_readiness

installers/install_kubeadm_cluster.sh

+7 −7
Original line number Diff line number Diff line
@@ -131,11 +131,8 @@ function remove_k8s_namespace() { 
    kubectl delete ns $1 2>/dev/null

    [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function

}

# main

OSM_CLUSTER_WORK_DIR="/etc/osm"

OSM_DEVOPS="/usr/share/osm-devops"

DEBUG_INSTALL=""



# main

while getopts ":D:d:-: " o; do

    case "${o}" in

        d)
@@ -163,14 +160,17 @@ while getopts ":D:d:-: " o; do 
    esac

done



source $OSM_DEVOPS/common/logging

source $OSM_DEVOPS/common/track



DEBUG_INSTALL=${DEBUG_INSTALL:-}

OSM_DEVOPS=${OSM_DEVOPS:-"/usr/share/osm-devops"}

OSM_CLUSTER_WORK_DIR=${OSM_CLUSTER_WORK_DIR:-"/etc/osm"}

echo "DEBUG_INSTALL=$DEBUG_INSTALL"

echo "OSM_DEVOPS=$OSM_DEVOPS"

echo "OSM_CLUSTER_WORK_DIR=$OSM_CLUSTER_WORK_DIR"

echo "HOME=$HOME"



source $OSM_DEVOPS/common/logging

source $OSM_DEVOPS/common/track



echo "Creating folders for installation"

[ ! -d "$OSM_CLUSTER_WORK_DIR" ] && sudo mkdir -p $OSM_CLUSTER_WORK_DIR

echo "Copying kubeadm-config from $OSM_DEVOPS/installers/kubeadm-config.yaml to $OSM_CLUSTER_WORK_DIR/kubeadm-config.yaml"