[odl] Mend standalone mode condition

[fuel.git] / build / config.mk

diff --git a/build/config.mk b/build/config.mk
index ab27858..5448c5e 100644 (file)
--- a/build/config.mk
+++ b/build/config.mk
@@ -13,12 +13,14 @@
 # remotes, ALL submodules will point to remote branch HEAD).
 # NOTE: Pinning fuel-main or other submodules to a specific commit/tag is
 # done ONLY via git submodules.
-FUEL_MAIN_TAG = 9.0.1
-MOS_VERSION   = 9.0
-OPENSTACK_VERSION = mitaka-9.0
+FUEL_MAIN_TAG = master
+MOS_VERSION   = 10.0
+OPENSTACK_VERSION = newton-10.0
 
-# FIXME(alav): Disable remote tracking for now, stick to submodule commits
-FUEL_TRACK_REMOTES =
+# List of space-separated Ubuntu architectures supported with current build
+# Format: same as `dpkg-architecture -qDEB_HOST_ARCH`
+# NOTE: Currently only amd64 is supported by Fuel@OPNFV. Armband adds arm64.
+export UBUNTU_ARCH ?= amd64
 
 ##############################################################################
 # Fuel components pinning / remote tracking; use submodules from f_repos
@@ -34,6 +36,7 @@ F_OPNFV_TAG  := ${FUEL_MAIN_TAG}-opnfv
 # fuel-main repo location used by main Makefile ISO building, use submodule
 FUEL_MAIN_REPO := ${F_SUBMOD_DIR}/fuel-main
 
+
 export FUELLIB_REPO?=${F_SUBMOD_DIR}/fuel-library
 export NAILGUN_REPO?=${F_SUBMOD_DIR}/fuel-web
 export PYTHON_FUELCLIENT_REPO?=${F_SUBMOD_DIR}/python-fuelclient
@@ -41,11 +44,9 @@ export FUEL_AGENT_REPO?=${F_SUBMOD_DIR}/fuel-agent
 export FUEL_NAILGUN_AGENT_REPO?=${F_SUBMOD_DIR}/fuel-nailgun-agent
 export ASTUTE_REPO?=${F_SUBMOD_DIR}/fuel-astute
 export OSTF_REPO?=${F_SUBMOD_DIR}/fuel-ostf
-export FUEL_MIRROR_REPO?=${F_SUBMOD_DIR}/fuel-mirror
 export FUELMENU_REPO?=${F_SUBMOD_DIR}/fuel-menu
 export SHOTGUN_REPO?=${F_SUBMOD_DIR}/shotgun
 export NETWORKCHECKER_REPO?=${F_SUBMOD_DIR}/network-checker
-export FUELUPGRADE_REPO?=${F_SUBMOD_DIR}/fuel-upgrade
 export FUEL_UI_REPO?=${F_SUBMOD_DIR}/fuel-ui
 
 # OPNFV tags are automatically applied by `make -C f_repos patches-import`