From 5b3f6b676b478e26c1a8e312fe55414410b6c523 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Mon, 22 Jan 2024 13:15:31 +0100 Subject: [PATCH] Move kubeadm folder creation from full_install_osm.sh to install_kubeadm_cluster.sh Change-Id: Iaa02b89c029eb933e4ca5f5052a1829527b71a4a Signed-off-by: garciadeblas --- installers/full_install_osm.sh | 4 ---- installers/install_kubeadm_cluster.sh | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh index c38a364f..68474a03 100755 --- a/installers/full_install_osm.sh +++ b/installers/full_install_osm.sh @@ -492,10 +492,6 @@ function install_osm() { track docker_ce docker_ce_ok - echo "Creating folders for installation" - [ ! -d "$OSM_WORK_DIR" ] && sudo mkdir -p $OSM_WORK_DIR - sudo cp -b $OSM_DEVOPS/installers/kubeadm-config.yaml $OSM_WORK_DIR/kubeadm-config.yaml - $OSM_DEVOPS/installers/install_kubeadm_cluster.sh -i ${OSM_DEFAULT_IP} -d ${OSM_WORK_DIR} -D ${OSM_DEVOPS} ${DEBUG_INSTALL} || \ FATAL_TRACK k8scluster "install_kubeadm_cluster.sh failed" track k8scluster k8scluster_ok diff --git a/installers/install_kubeadm_cluster.sh b/installers/install_kubeadm_cluster.sh index 6855d9f4..0d5f12cb 100755 --- a/installers/install_kubeadm_cluster.sh +++ b/installers/install_kubeadm_cluster.sh @@ -351,6 +351,10 @@ echo "OSM_CLUSTER_WORK_DIR=$OSM_CLUSTER_WORK_DIR" echo "INSTALL_K8S_MONITOR=$INSTALL_K8S_MONITOR" echo "HOME=$HOME" +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" +sudo cp -b $OSM_DEVOPS/installers/kubeadm-config.yaml $OSM_CLUSTER_WORK_DIR/kubeadm-config.yaml install_kube check_and_track_kube_install -- 2.25.1