MT#17849 Remove PXE handling from deployment.sh, ngcp-installer cares about iPXE

Change-Id: Ic6618da4f3787ea0a652dc0887e60a6684fb797b
changes/33/4933/3
Alexander Lutay 9 years ago
parent ec8d6ea351
commit e4100cdec2

@ -77,8 +77,6 @@ DEBIAN_REPO_HOST="debian.sipwise.com"
SIPWISE_REPO_HOST="deb.sipwise.com"
SIPWISE_REPO_TRANSPORT="https"
DPL_MYSQL_REPLICATION=true
GRML_PXE_IMAGES_PATH="/lib/live/mount/medium"
PXE_IMAGES_PATH="/tmp/grml_pxe"
FILL_APPROX_CACHE=false
VLAN_BOOT_INT=2
VLAN_SSH_EXT=300
@ -1557,7 +1555,6 @@ gen_installer_config () {
if "$CARRIER_EDITION" ; then
cat > ${TARGET}/etc/ngcp-installer/config_deploy.inc << EOF
CROLE="${CROLE}"
PXE_IMAGES_PATH="${PXE_IMAGES_PATH}"
MANAGEMENT_IP="${MANAGEMENT_IP}"
FILL_APPROX_CACHE="${FILL_APPROX_CACHE}"
VLAN_BOOT_INT="${VLAN_BOOT_INT}"
@ -1617,12 +1614,6 @@ if "$NGCP_INSTALLER" ; then
# generate debian/sipwise repos
set_repos
if "$CARRIER_EDITION"; then
logit "Mounting GRML image for ngcpcfg-api in ngcp-installer..."
mkdir -p "${TARGET}/$PXE_IMAGES_PATH"
mount --read-only --bind "$GRML_PXE_IMAGES_PATH" "${TARGET}/$PXE_IMAGES_PATH"
fi
set_deploy_status "ngcp-installer"
# install ngcp-installer
@ -2289,9 +2280,6 @@ fi
# don't leave any mountpoints
sync
if "$CARRIER_EDITION"; then
umount ${TARGET}/$PXE_IMAGES_PATH 2>/dev/null || true
fi
umount ${TARGET}/proc 2>/dev/null || true
umount ${TARGET}/sys 2>/dev/null || true
umount ${TARGET}/dev/pts 2>/dev/null || true

Loading…
Cancel
Save