Code Review
/
icn.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Increase timeout for EMCO charts
[icn.git]
/
deploy
/
site
/
vm
/
vm.sh
diff --git
a/deploy/site/vm/vm.sh
b/deploy/site/vm/vm.sh
index
de1fdf8
..
1308854
100755
(executable)
--- a/
deploy/site/vm/vm.sh
+++ b/
deploy/site/vm/vm.sh
@@
-10,6
+10,10
@@
source $SCRIPTDIR/../common.sh
BUILDDIR=${SCRIPTDIR/deploy/build}
mkdir -p ${BUILDDIR}
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/vm"}
+
FLUX_SOPS_KEY_NAME=${FLUX_SOPS_KEY_NAME:-"icn-site-vm"}
# !!!NOTE!!! THE KEYS USED BELOW ARE FOR TEST PURPOSES ONLY. DO NOT
FLUX_SOPS_KEY_NAME=${FLUX_SOPS_KEY_NAME:-"icn-site-vm"}
# !!!NOTE!!! THE KEYS USED BELOW ARE FOR TEST PURPOSES ONLY. DO NOT
@@
-42,11
+46,11
@@
function build_source {
function deploy {
gpg --import ${SCRIPTDIR}/sops.asc
function deploy {
gpg --import ${SCRIPTDIR}/sops.asc
- flux_create_site
https://gerrit.akraino.org/r/icn master deploy/site/vm
${FLUX_SOPS_KEY_NAME}
+ flux_create_site
${SITE_REPO} ${SITE_BRANCH} ${SITE_PATH}
${FLUX_SOPS_KEY_NAME}
}
function clean {
}
function clean {
- kubectl -n flux-system delete kustomization
icn-master-site-vm
+ kubectl -n flux-system delete kustomization
$(flux_site_kustomization_name ${SITE_REPO} ${SITE_BRANCH} ${SITE_PATH})
}
function is_cluster_ready {
}
function is_cluster_ready {
@@
-80,7
+84,12
@@
function insert_control_plane_network_identity_into_ssh_config {
cat <<EOF >>${HOME}/.ssh/config
Host ${host}
IdentityFile ${SCRIPTDIR}/id_rsa
cat <<EOF >>${HOME}/.ssh/config
Host ${host}
IdentityFile ${SCRIPTDIR}/id_rsa
+ StrictHostKeyChecking no
+ UserKnownHostsFile /dev/null
EOF
EOF
+ # Add the identity to authorized keys on this host to enable ssh
+ # logins via its control plane address
+ cat ${SCRIPTDIR}/id_rsa.pub >> ~/.ssh/authorized_keys
}
function wait_for_all_ready {
}
function wait_for_all_ready {