TT#5851 Stops using git deamon on git.mgm (wget it from builder.mgm)

Change-Id: I1a264c07aefc7efca204f424efcdec623865ee01
(cherry picked from commit cee7febba9)
changes/10/14310/1
Alexander Lutay 9 years ago
parent f612e23560
commit 099cd6b26c

@ -1978,12 +1978,10 @@ vagrant_configuration() {
die "Error: failed to install 'bzip2 less ${linux_headers_package} make sudo' packages." die "Error: failed to install 'bzip2 less ${linux_headers_package} make sudo' packages."
fi fi
ngcp_vmbuilder='/tmp/ngcp-vmbuilder/' vagrant_ssh_pub_key='/var/tmp/id_rsa_sipwise.pub'
if [ -d "${ngcp_vmbuilder}" ] ; then
echo "Checkout of ngcp-vmbuilder exists already, nothing to do"
else
echo "Checking out ngcp-vmbuilder git repository" echo "Checking out ngcp-vmbuilder git repository"
git clone git://git.mgm.sipwise.com/vmbuilder "${ngcp_vmbuilder}" 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 fi
if "$NGCP_INSTALLER" ; then if "$NGCP_INSTALLER" ; then
@ -1998,14 +1996,14 @@ vagrant_configuration() {
echo "Adjusting ssh configuration for user sipwise (add Vagrant SSH key)" echo "Adjusting ssh configuration for user sipwise (add Vagrant SSH key)"
mkdir -p "${TARGET}/${SIPWISE_HOME}/.ssh/" 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}" chown sipwise:sipwise "${SIPWISE_HOME}/.ssh" "${SIPWISE_HOME}/.ssh/sipwise_vagrant_key"
chroot "${TARGET}" chmod 0600 "${SIPWISE_HOME}/.ssh/sipwise_vagrant_key" chroot "${TARGET}" chmod 0600 "${SIPWISE_HOME}/.ssh/sipwise_vagrant_key"
fi fi
echo "Adjusting ssh configuration for user root" echo "Adjusting ssh configuration for user root"
mkdir -p "${TARGET}/root/.ssh/" 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 chroot "${TARGET}" chmod 0600 /root/.ssh/sipwise_vagrant_key
case "${DEBIAN_RELEASE}" in case "${DEBIAN_RELEASE}" in
squeeze) squeeze)

Loading…
Cancel
Save