MT#9249 Add boot option ngcpfillcache & stop changing hosts/interfaces on Carrier

Also, we did s/RETRIEVE_MGMT_CONFIG/CARRIER_EDITION/g because /etc/hosts
and /etc/network/interfaces are fully configured for Carrier by ngcp-installer.
So, no need to touch them for Carrier at all now
(see commits to installer.git through this ticket).

Change-Id: Ie16038d1f6c194564bb91c52faab75e86e3a0c11
changes/41/1341/2
Alexander Lutay 10 years ago
parent a0c272afed
commit fbfcb7f088

@ -65,6 +65,7 @@ SIPWISE_REPO_TRANSPORT="http"
DPL_MYSQL_REPLICATION=true DPL_MYSQL_REPLICATION=true
GRML_PXE_IMAGES_PATH="/lib/live/mount/medium" GRML_PXE_IMAGES_PATH="/lib/live/mount/medium"
PXE_IMAGES_PATH="/tmp/grml_pxe" PXE_IMAGES_PATH="/tmp/grml_pxe"
FILL_APPROX_CACHE=false
# if TARGET_DISK environment variable is set accept it # if TARGET_DISK environment variable is set accept it
if [ -n "$TARGET_DISK" ] ; then if [ -n "$TARGET_DISK" ] ; then
@ -548,6 +549,10 @@ fi
if checkBootParam ngcpnomysqlrepl ; then if checkBootParam ngcpnomysqlrepl ; then
DPL_MYSQL_REPLICATION=false DPL_MYSQL_REPLICATION=false
fi fi
if checkBootParam ngcpfillcache ; then
FILL_APPROX_CACHE=true
fi
## }}} ## }}}
## interactive mode {{{ ## interactive mode {{{
@ -633,6 +638,7 @@ for param in $* ; do
*vagrant*) VAGRANT=true;; *vagrant*) VAGRANT=true;;
*lowperformance*) ADJUST_FOR_LOW_PERFORMANCE=true;; *lowperformance*) ADJUST_FOR_LOW_PERFORMANCE=true;;
*enablevmservices*) ENABLE_VM_SERVICES=true;; *enablevmservices*) ENABLE_VM_SERVICES=true;;
*ngcpfillcache*) FILL_APPROX_CACHE=true;;
esac esac
shift shift
done done
@ -1400,6 +1406,7 @@ gen_installer_config () {
CROLE="${CROLE}" CROLE="${CROLE}"
PXE_IMAGES_PATH="${PXE_IMAGES_PATH}" PXE_IMAGES_PATH="${PXE_IMAGES_PATH}"
MANAGEMENT_IP="${MANAGEMENT_IP}" MANAGEMENT_IP="${MANAGEMENT_IP}"
FILL_APPROX_CACHE="${FILL_APPROX_CACHE}"
EOF EOF
fi fi
@ -1558,8 +1565,8 @@ EOT
fi fi
if "$RETRIEVE_MGMT_CONFIG" ; then if "$CARRIER_EDITION" ; then
echo "Nothing to do (RETRIEVE_MGMT_CONFIG is set), /etc/network/interfaces was already set up." echo "Nothing to do on Carrier, /etc/network/interfaces was already set up."
elif ! "$NGCP_INSTALLER" ; then elif ! "$NGCP_INSTALLER" ; then
echo "Not modifying /etc/network/interfaces as installing plain Debian." echo "Not modifying /etc/network/interfaces as installing plain Debian."
elif "$DHCP" ; then elif "$DHCP" ; then
@ -1932,8 +1939,8 @@ vagrant_configuration() {
fi fi
} }
if "$RETRIEVE_MGMT_CONFIG" ; then if "$CARRIER_EDITION" ; then
echo "Nothing to do, /etc/hosts was already set up." echo "Nothing to do on Carrier, /etc/hosts was already set up."
else else
echo "Generating /etc/hosts" echo "Generating /etc/hosts"
generate_etc_hosts generate_etc_hosts

Loading…
Cancel
Save