projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clean installer references to OSM_DOCKER_WORK_DIR
[osm/devops.git]
/
installers
/
install_kubeadm_cluster.sh
diff --git
a/installers/install_kubeadm_cluster.sh
b/installers/install_kubeadm_cluster.sh
index
0ec2a31
..
0459bed
100755
(executable)
--- a/
installers/install_kubeadm_cluster.sh
+++ b/
installers/install_kubeadm_cluster.sh
@@
-55,7
+55,7
@@
function init_kubeadm() {
[ -z "${DEBUG_INSTALL}" ] || DEBUG beginning of function
sudo swapoff -a
sudo sed -i.bak '/.*none.*swap/s/^\(.*\)$/#\1/g' /etc/fstab
[ -z "${DEBUG_INSTALL}" ] || DEBUG beginning of function
sudo swapoff -a
sudo sed -i.bak '/.*none.*swap/s/^\(.*\)$/#\1/g' /etc/fstab
- sudo kubeadm init --dry-run || FATAL_TRACK k8scluster "kubeadm init dry-run failed"
+ sudo kubeadm init --
config $1 --
dry-run || FATAL_TRACK k8scluster "kubeadm init dry-run failed"
sudo kubeadm init --config $1
sleep 5
[ -z "${DEBUG_INSTALL}" ] || DEBUG end of function
sudo kubeadm init --config $1
sleep 5
[ -z "${DEBUG_INSTALL}" ] || DEBUG end of function
@@
-177,10
+177,10
@@
function install_helm_metallb() {
- name: default
protocol: layer2
addresses:
- name: default
protocol: layer2
addresses:
- - $METALLB_IP_RANGE" | sudo tee -a ${OSM_
DOCK
ER_WORK_DIR}/metallb-config.yaml
+ - $METALLB_IP_RANGE" | sudo tee -a ${OSM_
CLUST
ER_WORK_DIR}/metallb-config.yaml
helm repo add metallb https://metallb.github.io/metallb
helm repo update
helm repo add metallb https://metallb.github.io/metallb
helm repo update
- helm install --create-namespace --namespace metallb-system metallb metallb/metallb --version ${METALLB_VERSION} -f ${OSM_
DOCK
ER_WORK_DIR}/metallb-config.yaml
+ helm install --create-namespace --namespace metallb-system metallb metallb/metallb --version ${METALLB_VERSION} -f ${OSM_
CLUST
ER_WORK_DIR}/metallb-config.yaml
[ -z "${DEBUG_INSTALL}" ] || DEBUG end of function
}
[ -z "${DEBUG_INSTALL}" ] || DEBUG end of function
}
@@
-311,7
+311,7
@@
while getopts ":D:d:i:-: " o; do
DEFAULT_IP="${OPTARG}"
;;
d)
DEFAULT_IP="${OPTARG}"
;;
d)
- OSM_
DOCK
ER_WORK_DIR="${OPTARG}"
+ OSM_
CLUST
ER_WORK_DIR="${OPTARG}"
;;
D)
OSM_DEVOPS="${OPTARG}"
;;
D)
OSM_DEVOPS="${OPTARG}"
@@
-341,7
+341,7
@@
source $OSM_DEVOPS/common/track
echo "DEBUG_INSTALL=$DEBUG_INSTALL"
echo "DEFAULT_IP=$DEFAULT_IP"
echo "OSM_DEVOPS=$OSM_DEVOPS"
echo "DEBUG_INSTALL=$DEBUG_INSTALL"
echo "DEFAULT_IP=$DEFAULT_IP"
echo "OSM_DEVOPS=$OSM_DEVOPS"
-echo "OSM_
DOCKER_WORK_DIR=$OSM_DOCK
ER_WORK_DIR"
+echo "OSM_
CLUSTER_WORK_DIR=$OSM_CLUST
ER_WORK_DIR"
echo "INSTALL_K8S_MONITOR=$INSTALL_K8S_MONITOR"
echo "HOME=$HOME"
echo "INSTALL_K8S_MONITOR=$INSTALL_K8S_MONITOR"
echo "HOME=$HOME"
@@
-349,7
+349,7
@@
echo "HOME=$HOME"
install_kube
check_and_track_kube_install
install_kube
check_and_track_kube_install
-init_kubeadm $OSM_
DOCKER_WORK_DIR/cluster
-config.yaml
+init_kubeadm $OSM_
CLUSTER_WORK_DIR/kubeadm
-config.yaml
kube_config_dir
check_and_track_init_k8s
kube_config_dir
check_and_track_init_k8s