From 099cd6b26cdcf466e827eb0992ff228406e7c38c Mon Sep 17 00:00:00 2001
From: Alexander Lutay <alutay@sipwise.com>
Date: Wed, 9 Nov 2016 20:03:45 +0100
Subject: [PATCH] TT#5851 Stops using git deamon on git.mgm (wget it from
 builder.mgm)

Change-Id: I1a264c07aefc7efca204f424efcdec623865ee01
(cherry picked from commit cee7febba9571b9dbc308f245f55d2ec7de7b3a4)
---
 deployment.sh | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/deployment.sh b/deployment.sh
index 70338af..cbc4e49 100755
--- a/deployment.sh
+++ b/deployment.sh
@@ -1978,12 +1978,10 @@ vagrant_configuration() {
     die "Error: failed to install 'bzip2 less ${linux_headers_package} make sudo' packages."
   fi
 
-  ngcp_vmbuilder='/tmp/ngcp-vmbuilder/'
-  if [ -d "${ngcp_vmbuilder}" ] ; then
-    echo "Checkout of ngcp-vmbuilder exists already, nothing to do"
-  else
-    echo "Checking out ngcp-vmbuilder git repository"
-    git clone git://git.mgm.sipwise.com/vmbuilder "${ngcp_vmbuilder}"
+  vagrant_ssh_pub_key='/var/tmp/id_rsa_sipwise.pub'
+  echo "Checking out ngcp-vmbuilder git repository"
+  if ! wget -O "${vagrant_ssh_pub_key}" http://builder.mgm.sipwise.com/vagrant-ngcp/id_rsa_sipwise.pub ; then
+    die "Error: failed to wget public Sipwise SSH key for Vagrant boxes"
   fi
 
   if "$NGCP_INSTALLER" ; then
@@ -1998,14 +1996,14 @@ vagrant_configuration() {
 
     echo "Adjusting ssh configuration for user sipwise (add Vagrant SSH key)"
     mkdir -p "${TARGET}/${SIPWISE_HOME}/.ssh/"
-    cat "${ngcp_vmbuilder}/config/id_rsa_sipwise.pub" >> "${TARGET}/${SIPWISE_HOME}/.ssh/sipwise_vagrant_key"
+    cat "${vagrant_ssh_pub_key}" >> "${TARGET}/${SIPWISE_HOME}/.ssh/sipwise_vagrant_key"
     chroot "${TARGET}" chown sipwise:sipwise "${SIPWISE_HOME}/.ssh" "${SIPWISE_HOME}/.ssh/sipwise_vagrant_key"
     chroot "${TARGET}" chmod 0600 "${SIPWISE_HOME}/.ssh/sipwise_vagrant_key"
   fi
 
   echo "Adjusting ssh configuration for user root"
   mkdir -p "${TARGET}/root/.ssh/"
-  cat "${ngcp_vmbuilder}/config/id_rsa_sipwise.pub" >> "${TARGET}/root/.ssh/sipwise_vagrant_key"
+  cat "${vagrant_ssh_pub_key}" >> "${TARGET}/root/.ssh/sipwise_vagrant_key"
   chroot "${TARGET}" chmod 0600 /root/.ssh/sipwise_vagrant_key
   case "${DEBIAN_RELEASE}" in
     squeeze)