X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=deploy%2Fsite%2Fpod11%2Fpod11.sh;h=0c2428deeb88fdceef046f12a5d75e8365b9084a;hb=878ea0c739ece152793328a795780c734e4ac9b2;hp=c031495e39f251ab2a3f3b38d42cf70c1204ca8e;hpb=7d9a147be328eb6fa90d64ef845635d506601d12;p=icn.git

diff --git a/deploy/site/pod11/pod11.sh b/deploy/site/pod11/pod11.sh
index c031495..0c2428d 100755
--- a/deploy/site/pod11/pod11.sh
+++ b/deploy/site/pod11/pod11.sh
@@ -10,18 +10,22 @@ source $SCRIPTDIR/../common.sh
 BUILDDIR=${SCRIPTDIR/deploy/build}
 mkdir -p ${BUILDDIR}
 
+SITE_REPO=${SITE_REPO:-"https://gerrit.akraino.org/r/icn"}
+SITE_BRANCH=${SITE_BRANCH:-"master"}
+SITE_PATH=${SITE_PATH:-"deploy/site/pod11"}
+
 FLUX_SOPS_KEY_NAME=${FLUX_SOPS_KEY_NAME:-"icn-site-vm"} # TODO Replace ICN test key with real key
 
 function build_source {
-    sops_encrypt_site ${SCRIPTDIR}/site.yaml ${FLUX_SOPS_KEY_NAME}
+    sops_encrypt ${SCRIPTDIR}/site.yaml ${FLUX_SOPS_KEY_NAME}
 }
 
 function deploy {
-    flux_create_site https://gerrit.akraino.org/r/icn master deploy/site/pod11 ${FLUX_SOPS_KEY_NAME}
+    flux_create_site ${SITE_REPO} ${SITE_BRANCH} ${SITE_PATH} ${FLUX_SOPS_KEY_NAME}
 }
 
 function clean {
-    kubectl -n flux-system delete kustomization icn-master-site-pod11
+    kubectl -n flux-system delete kustomization $(flux_site_kustomization_name ${SITE_REPO} ${SITE_BRANCH} ${SITE_PATH})
 }
 
 function is_cluster_ready {
@@ -36,28 +40,6 @@ function is_control_plane_ready {
     [[ $(kubectl --kubeconfig=${BUILDDIR}/icn-admin.conf get nodes -l node-role.kubernetes.io/control-plane -o jsonpath='{range .items[*]}{.status.conditions[?(@.type=="Ready")].status}{"\n"}{end}' | grep -c True) == ${replicas} ]]
 }
 
-function insert_control_plane_network_identity_into_ssh_config {
-    # This enables logging into the control plane machines from this
-    # machine without specifying the identify file on the command line
-
-    # Create ssh config if it doesn't exist
-    mkdir -p ${HOME}/.ssh && chmod 700 ${HOME}/.ssh
-    touch ${HOME}/.ssh/config
-    chmod 600 ${HOME}/.ssh/config
-    # Add the entry for the control plane network, host value in ssh
-    # config is a wildcard
-    endpoint=$(helm -n metal3 get values -a cluster-icn | awk '/controlPlaneEndpoint:/ {print $2}')
-    prefix=$(helm -n metal3 get values -a cluster-icn | awk '/controlPlanePrefix:/ {print $2}')
-    host=$(ipcalc ${endpoint}/${prefix} | awk '/Network:/ {sub(/\.0.*/,".*"); print $2}')
-    if [[ $(grep -c "Host ${host}" ${HOME}/.ssh/config) != 0 ]]; then
-	sed -i -e '/Host '"${host}"'/,+1 d' ${HOME}/.ssh/config
-    fi
-    cat <<EOF >>${HOME}/.ssh/config
-Host ${host}
-  IdentityFile ${SCRIPTDIR}/id_rsa
-EOF
-}
-
 function wait_for_all_ready {
     WAIT_FOR_INTERVAL=60s
     WAIT_FOR_TRIES=30
@@ -65,7 +47,6 @@ function wait_for_all_ready {
     clusterctl -n metal3 get kubeconfig icn >${BUILDDIR}/icn-admin.conf
     chmod 600 ${BUILDDIR}/icn-admin.conf
     wait_for is_control_plane_ready
-    insert_control_plane_network_identity_into_ssh_config
 }
 
 case $1 in