X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=deploy%2Fsite%2Fvm%2Fvm.sh;h=3f3b3fbb2677122d53d7dbd2f3865e35457e3d3d;hb=50b3ce56a980a97e69762fc2b4341f6fffe4df73;hp=20cae733e6dacc5bfaceb185c9b40fedb245fc75;hpb=143aff16339c50dfcdab3ba37b4258cf54623564;p=icn.git

diff --git a/deploy/site/vm/vm.sh b/deploy/site/vm/vm.sh
index 20cae73..3f3b3fb 100755
--- a/deploy/site/vm/vm.sh
+++ b/deploy/site/vm/vm.sh
@@ -24,7 +24,7 @@ function build_source {
     # attempting to encrypt it twice below
     if [[ -f ${FLUX_SOPS_PRIVATE_KEY} ]]; then
 	gpg --import ${FLUX_SOPS_PRIVATE_KEY}
-	sops_decrypt_site ${SCRIPTDIR}/site.yaml
+	sops_decrypt ${SCRIPTDIR}/site.yaml
     fi
 
     # Generate user password and authorized key in site YAML
@@ -39,7 +39,7 @@ function build_source {
 
     # Encrypt the site YAML
     create_gpg_key ${FLUX_SOPS_KEY_NAME}
-    sops_encrypt_site ${SCRIPTDIR}/site.yaml ${FLUX_SOPS_KEY_NAME}
+    sops_encrypt ${SCRIPTDIR}/site.yaml ${FLUX_SOPS_KEY_NAME}
 
     # ONLY FOR TEST ENVIRONMENT: save the private key used
     export_gpg_private_key ${FLUX_SOPS_KEY_NAME} >${FLUX_SOPS_PRIVATE_KEY}
@@ -70,6 +70,10 @@ 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
 
+    if [[ ! $(which ipcalc) ]]; then
+        apt-get install -y ipcalc
+    fi
+
     # Create ssh config if it doesn't exist
     mkdir -p ${HOME}/.ssh && chmod 700 ${HOME}/.ssh
     touch ${HOME}/.ssh/config