27 files changed, 268 insertions, 357 deletions

diff --git a/patches/opnfv-fuel/0046-build-Use-OPNFV_GIT_SHA-for-ISO-preparer-ID.patch b/patches/opnfv-fuel/0000-build-Use-OPNFV_GIT_SHA-for-ISO-preparer-ID.patch
index e6d4dc21..27b00c71 100644
--- a/patches/opnfv-fuel/0046-build-Use-OPNFV_GIT_SHA-for-ISO-preparer-ID.patch
+++ b/patches/opnfv-fuel/0000-build-Use-OPNFV_GIT_SHA-for-ISO-preparer-ID.patch
@@ -6,36 +6,64 @@ isoinfo -i lists the following information for Fuel@OPNFV ISO:
 "Data preparer id: 86aafaf5454a846c417848bb94f264c4420160f3"
 where the SHA hash is Fuel git repo HEAD SHA.
 
+For Armband's build system, using only the Fuel commit ID is not
+enough to fully describe the state of the source code, as patches
+are also applied to other fuel modules (as git submodules).
+Instead, a pointer to a valid Armband commit ID should be used.
+
 However, Armband overrides OPNFV_GIT_SHA to the Armband git repo
 commit hash, so the ISO metadata should also reflect this.
 
+While at it, allow product name to be overriden, to signal the
+commit ID should be looked up inside the Armband repository.
+
+Change-Id: I33ad490f1afe28c1d439dda40e39cee1955e0ac2
 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
 ---
+ build/Makefile           | 4 ++--
  build/docker/runcontext  | 2 +-
  build/install/install.sh | 6 +++++-
- 2 files changed, 6 insertions(+), 2 deletions(-)
+ 3 files changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/build/Makefile b/build/Makefile
+index 56acb40..ac85498 100644
+--- a/build/Makefile
++++ b/build/Makefile
+@@ -21,11 +21,11 @@ SHELL = /bin/bash
+ export MOSVERSION = 9.0
+ export ISOSRC = file:$(shell pwd)/fuel-$(MOSVERSION).iso
+ export ISOCACHE = $(shell pwd)/$(shell basename $(ISOSRC))
+-export PRODNO = "OPNFV_FUEL"
++export PRODNO ?= "OPNFV_FUEL"
+ export REVSTATE = "P0000"
+ export USER ?= $(shell whoami)
+ export BUILD_DATE = $(shell date --utc +%Y-%m-%d:%H:%M)
+-export OPNFV_GIT_SHA = $(shell git rev-parse HEAD)
++export OPNFV_GIT_SHA ?= $(shell git rev-parse HEAD)
+ # Store in /etc/fuel_build_id on fuel master
+ export BUILD_ID := $(PRODNO)_$(BUILD_DATE)_$(OPNFV_GIT_SHA)
 
 diff --git a/build/docker/runcontext b/build/docker/runcontext
-index e4874df..07b0dc1 100755
+index daad663..2d13562 100755
 --- a/build/docker/runcontext
 +++ b/build/docker/runcontext
-@@ -119,7 +119,7 @@ RUN_CONTEXT_OPT="--cidfile $CID_FILE --privileged=true --rm \
+@@ -115,7 +115,7 @@ RUN_CONTEXT_OPT="--cidfile $CID_FILE --privileged=true --rm \
      -e HOME=$HOME -e CACHEDEBUG -e CACHETRANSPORT -e CACHEMAXAGE -e CACHEBASE \
      -e BUILD_FUEL_PLUGINS -e MIRROR_UBUNTU -e MIRROR_UBUNTU_ROOT \
      -e MIRROR_MOS_UBUNTU -e MIRROR_MOS_UBUNTU_ROOT -e MIRROR_FUEL \
--    -e LATEST_TARGET_UBUNTU -e UBUNTU_ARCH -e ARMBAND_BASE \
-+    -e LATEST_TARGET_UBUNTU -e UBUNTU_ARCH -e ARMBAND_BASE -e OPNFV_GIT_SHA \
+-    -e LATEST_TARGET_UBUNTU -e UBUNTU_ARCH \
++    -e LATEST_TARGET_UBUNTU -e UBUNTU_ARCH -e OPNFV_GIT_SHA \
      -u $USER_ID:$GROUP_ID -w $PWD \
      -v $GITROOT:$GITROOT -v /sys/fs/cgroup:/sys/fs/cgroup:ro $CACHEMOUNT"
- 
+
 diff --git a/build/install/install.sh b/build/install/install.sh
-index f6308fb..9e003bb 100755
+index c632419..866d304 100755
 --- a/build/install/install.sh
 +++ b/build/install/install.sh
-@@ -210,8 +210,12 @@ make_iso_image() {
+@@ -196,8 +196,12 @@ make_iso_image() {
      find . -name TRANS.TBL -exec rm {} \;
      rm -rf rr_moved
- 
+
 +    if [[ -z "$OPNFV_GIT_SHA" ]]; then
 +        OPNFV_GIT_SHA=$(git rev-parse --verify HEAD)
 +    fi
diff --git a/patches/opnfv-fuel/0001-build-Add-ARMBAND_BASE-support.patch b/patches/opnfv-fuel/0001-build-Add-ARMBAND_BASE-support.patch
new file mode 100644
index 00000000..17cfd689
--- /dev/null
+++ b/patches/opnfv-fuel/0001-build-Add-ARMBAND_BASE-support.patch
@@ -0,0 +1,70 @@
+From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+Date: Thu, 11 Aug 2016 15:34:32 +0200
+Subject: [PATCH] build: Add ARMBAND_BASE support
+
+Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+---
+ build/Makefile          | 10 ++++++++++
+ build/docker/Dockerfile |  2 +-
+ build/docker/runcontext |  6 +++++-
+ 3 files changed, 18 insertions(+), 2 deletions(-)
+
+diff --git a/build/Makefile b/build/Makefile
+index 4454c35..377ecc6 100644
+--- a/build/Makefile
++++ b/build/Makefile
+@@ -14,4 +14,9 @@ SHELL = /bin/bash
+
++# Only configure Armband specific stuff when ARMBAND_BASE is set
++ifdef ARMBAND_BASE
++    include ${ARMBAND_BASE}/armband-fuel-config.mk
++endif
++
+ ############################################################################
+ # BEGIN of variables to customize
+ #
+@@ -140,6 +140,7 @@ $(ISOCACHE):
+ 	# fuel-main Makefiles do not like `make -C`
+ 	cd $(FUEL_MAIN_DIR) && make repos
+ 	cp f_repos/.cachefuelinfo gitinfo_fuel.txt
++	test -z $(ARMBAND_BASE) || $(REPOINFO) $(ARMBAND_BASE) >> gitinfo_fuel.txt
+
+ 	# Repeat build up to three times
+ 	sudo -E ./fuel_build_loop
+diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile
+index b38ea4c..624f233 100644
+--- a/build/docker/Dockerfile
++++ b/build/docker/Dockerfile
+@@ -30,7 +30,7 @@ RUN echo "Defaults env_keep += \"ftp_proxy http_proxy https_proxy no_proxy RSYNC
+ # Keeping PWD is needed to build as root
+ RUN echo "Defaults env_keep += \"PWD\"" > /etc/sudoers.d/keep-pwd
+ # Keeping variables for ISO build
+-RUN echo "Defaults env_keep += \"MIRROR_UBUNTU MIRROR_UBUNTU_ROOT MIRROR_MOS_UBUNTU MIRROR_MOS_UBUNTU_ROOT MIRROR_FUEL LATEST_TARGET_UBUNTU UBUNTU_ARCH\"" > /etc/sudoers.d/keep-mos
++RUN echo "Defaults env_keep += \"MIRROR_UBUNTU MIRROR_UBUNTU_ROOT MIRROR_MOS_UBUNTU MIRROR_MOS_UBUNTU_ROOT MIRROR_FUEL LATEST_TARGET_UBUNTU UBUNTU_ARCH ARMBAND_BASE\"" > /etc/sudoers.d/keep-mos
+ RUN chmod 0440 /etc/sudoers.d/open-sudo
+ RUN chmod 0440 /etc/sudoers.d/keep-proxies
+ RUN chmod 0440 /etc/sudoers.d/keep-pwd
+diff --git a/build/docker/runcontext b/build/docker/runcontext
+index daad663..e4874df 100755
+--- a/build/docker/runcontext
++++ b/build/docker/runcontext
+@@ -42,6 +42,10 @@ GITROOT=`git rev-parse --show-toplevel`
+ CID_FILE=`mktemp -u -t runcontext.XXXXXXXXXX`
+ CONTEXT_DIR=`mktemp -d ${GITROOT}/.docker_contextXXXXXX`
+
++if [[ $ARMBAND_BASE ]]; then
++    GITROOT=$ARMBAND_BASE
++fi
++
+ # If RSYNC_CONNECT_PROG is used, we need to copy all of
+ # the SSH structure, should one of the keys need to be
+ # used.
+@@ -115,7 +119,7 @@ RUN_CONTEXT_OPT="--cidfile $CID_FILE --privileged=true --rm \
+     -e HOME=$HOME -e CACHEDEBUG -e CACHETRANSPORT -e CACHEMAXAGE -e CACHEBASE \
+     -e BUILD_FUEL_PLUGINS -e MIRROR_UBUNTU -e MIRROR_UBUNTU_ROOT \
+     -e MIRROR_MOS_UBUNTU -e MIRROR_MOS_UBUNTU_ROOT -e MIRROR_FUEL \
+-    -e LATEST_TARGET_UBUNTU -e UBUNTU_ARCH -e OPNFV_GIT_SHA \
++    -e LATEST_TARGET_UBUNTU -e UBUNTU_ARCH -e OPNFV_GIT_SHA -e ARMBAND_BASE \
+     -u $USER_ID:$GROUP_ID -w $PWD \
+     -v $GITROOT:$GITROOT -v /sys/fs/cgroup:/sys/fs/cgroup:ro $CACHEMOUNT"
+
diff --git a/patches/opnfv-fuel/0004-Fuel-VM-for-the-Enea-Armband-lab.patch b/patches/opnfv-fuel/0002-Fuel-VM-for-the-Enea-Armband-lab.patch
index aa97aa69..cefc0625 100644
--- a/patches/opnfv-fuel/0004-Fuel-VM-for-the-Enea-Armband-lab.patch
+++ b/patches/opnfv-fuel/0002-Fuel-VM-for-the-Enea-Armband-lab.patch
@@ -1,4 +1,3 @@
-From 800aae6db0d0d79d01cec4df85075026073063dd Mon Sep 17 00:00:00 2001
 From: Josep Puigdemont <josep.puigdemont@enea.com>
 Date: Wed, 4 May 2016 14:27:23 +0200
 Subject: [PATCH] Fuel VM for the Enea Armband lab
@@ -106,6 +105,3 @@ index 0000000..8773ed4
 +    </memballoon>
 +  </devices>
 +</domain>
--- 
-2.5.5
-
diff --git a/patches/opnfv-fuel/0009-dea_base-replace-grub-pc-by-grub-efi-arm64.patch b/patches/opnfv-fuel/0003-dea_base-replace-grub-pc-by-grub-efi-arm64.patch
index 08b84def..fae14001 100644
--- a/patches/opnfv-fuel/0009-dea_base-replace-grub-pc-by-grub-efi-arm64.patch
+++ b/patches/opnfv-fuel/0003-dea_base-replace-grub-pc-by-grub-efi-arm64.patch
@@ -12,11 +12,11 @@ index 0b8485b..658b328 100644
 --- a/deploy/config/dea_base.yaml
 +++ b/deploy/config/dea_base.yaml
 @@ -462,7 +462,7 @@ settings:
- 
+
            gdisk
- 
+
 -          grub-pc
 +          grub-efi-arm64
- 
+
            hpsa-dkms
- 
+
diff --git a/patches/opnfv-fuel/0010-post-scripts-Allow-SSH-on-non-admin-ifaces.patch b/patches/opnfv-fuel/0004-post-scripts-Allow-SSH-on-non-admin-ifaces.patch
index e098d47c..e098d47c 100644
--- a/patches/opnfv-fuel/0010-post-scripts-Allow-SSH-on-non-admin-ifaces.patch
+++ b/patches/opnfv-fuel/0004-post-scripts-Allow-SSH-on-non-admin-ifaces.patch
diff --git a/patches/opnfv-fuel/0030-deploy.py-add-a-time-stamp-to-the-new-ISO-image.patch b/patches/opnfv-fuel/0005-deploy.py-add-a-time-stamp-to-the-new-ISO-image.patch
index 3e3480b1..61847ab8 100644
--- a/patches/opnfv-fuel/0030-deploy.py-add-a-time-stamp-to-the-new-ISO-image.patch
+++ b/patches/opnfv-fuel/0005-deploy.py-add-a-time-stamp-to-the-new-ISO-image.patch
@@ -26,7 +26,7 @@ index 041ba2f..cebef97 100755
  import errno
  import signal
 @@ -100,8 +101,9 @@ class AutoDeploy(object):
- 
+
      def install_fuel_master(self):
          log('Install Fuel Master')
 -        new_iso = ('%s/deploy-%s'
diff --git a/patches/opnfv-fuel/0055-build-docker-Use-host-s-network-stack.patch b/patches/opnfv-fuel/0006-build-docker-Use-host-s-network-stack.patch
index d9fd36a0..69b0e82f 100644
--- a/patches/opnfv-fuel/0055-build-docker-Use-host-s-network-stack.patch
+++ b/patches/opnfv-fuel/0006-build-docker-Use-host-s-network-stack.patch
@@ -20,7 +20,7 @@ index 07b0dc1..b0d6d37 100755
 +++ b/build/docker/runcontext
 @@ -121,6 +121,7 @@ RUN_CONTEXT_OPT="--cidfile $CID_FILE --privileged=true --rm --net=host \
      -e MIRROR_MOS_UBUNTU -e MIRROR_MOS_UBUNTU_ROOT -e MIRROR_FUEL \
-     -e LATEST_TARGET_UBUNTU -e UBUNTU_ARCH -e ARMBAND_BASE -e OPNFV_GIT_SHA \
+     -e LATEST_TARGET_UBUNTU -e UBUNTU_ARCH -e OPNFV_GIT_SHA -e ARMBAND_BASE \
      -u $USER_ID:$GROUP_ID -w $PWD \
 +    -v /etc/hosts:/etc/hosts \
      -v $GITROOT:$GITROOT -v /sys/fs/cgroup:/sys/fs/cgroup:ro $CACHEMOUNT"
diff --git a/patches/opnfv-fuel/0006-deploy.sh-no-need-to-set-umask-0000.patch b/patches/opnfv-fuel/0006-deploy.sh-no-need-to-set-umask-0000.patch
deleted file mode 100644
index 9c005907..00000000
--- a/patches/opnfv-fuel/0006-deploy.sh-no-need-to-set-umask-0000.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From f67625ce6c607b47bc99c5118f5e52fe8a8e763b Mon Sep 17 00:00:00 2001
-From: Josep Puigdemont <josep.puigdemont@enea.com>
-Date: Fri, 6 May 2016 03:07:40 +0200
-Subject: [PATCH] deploy.sh: no need to set umask 0000
-
-Change-Id: If3283a16139097db57b06c0535d33a88dc1b2ed2
-Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
----
- ci/deploy.sh | 6 ------
- 1 file changed, 6 deletions(-)
-
-diff --git a/ci/deploy.sh b/ci/deploy.sh
-index 8411714..c08a94b 100755
---- a/ci/deploy.sh
-+++ b/ci/deploy.sh
-@@ -84,9 +84,6 @@ Input parameters to the build script is:
- -i .iso image to be deployed (needs to be provided in a URI
-    style, it can be a local resource: file:// or a remote resource http(s)://)
- 
--NOTE: Root priviledges are needed for this script to run
--
--
- Examples:
- sudo `basename $0` -b file:///home/jenkins/lab-config -l lf -p pod1 -s ha_odl-l3_heat_ceilometer -i file:///home/jenkins/myiso.iso
- EOF
-@@ -231,9 +228,6 @@ fi
- # Enable the automatic exit trap
- trap do_exit SIGINT SIGTERM EXIT
- 
--# Set no restrictive umask so that Jenkins can removeeee any residuals
--umask 0000
--
- clean
- 
- pushd ${DEPLOY_DIR} > /dev/null
--- 
-2.5.5
-
diff --git a/patches/opnfv-fuel/0039-deploy-Fix-add-bootstrap-DEA-override-delay.patch b/patches/opnfv-fuel/0007-deploy-Fix-add-bootstrap-DEA-override-delay.patch
index 2189b004..88ac7625 100644
--- a/patches/opnfv-fuel/0039-deploy-Fix-add-bootstrap-DEA-override-delay.patch
+++ b/patches/opnfv-fuel/0007-deploy-Fix-add-bootstrap-DEA-override-delay.patch
@@ -17,13 +17,13 @@ index 808d0b1..1a7685a 100644
 +++ b/deploy/install_fuel_master.py
 @@ -196,11 +196,13 @@ class InstallFuelMaster(object):
                       self.work_dir, os.path.basename(self.dea_file)))
- 
+
      def wait_until_installation_completed(self):
 -        WAIT_LOOP = 360
 +        WAIT_LOOP = 720
          SLEEP_TIME = 10
-         CMD = 'ps -ef | grep %s | grep -v grep' % BOOTSTRAP_ADMIN
- 
+         CMD = 'pgrep -f %s' % BOOTSTRAP_ADMIN
+
          install_completed = False
 +        time.sleep(60)
 +        self.wait_for_node_up()
diff --git a/patches/opnfv-fuel/0015-build-Makefile-Overrideable-product-commit-hash.patch b/patches/opnfv-fuel/0015-build-Makefile-Overrideable-product-commit-hash.patch
deleted file mode 100644
index 1c9bd82a..00000000
--- a/patches/opnfv-fuel/0015-build-Makefile-Overrideable-product-commit-hash.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Mon, 18 Jul 2016 23:50:30 +0200
-Subject: [PATCH] build/Makefile: Overrideable product, commit hash.
-
-For Armband's build system, using only the Fuel commit ID is not
-enough to fully describe the state of the source code, as patches
-are also applied to other fuel modules (as git submodules).
-Instead, a pointer to a valid Armband commit ID should be used.
-
-While at it, allow product name to be overriden, to signal the
-commit ID should be looked up inside the Armband repository.
-
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- build/Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/build/Makefile b/build/Makefile
-index ec5d27a..ba117da 100644
---- a/build/Makefile
-+++ b/build/Makefile
-@@ -21,11 +21,11 @@ SHELL = /bin/bash
- export MOSVERSION = 9.0
- export ISOSRC = file:$(shell pwd)/fuel-$(MOSVERSION).iso
- export ISOCACHE = $(shell pwd)/$(shell basename $(ISOSRC))
--export PRODNO = "OPNFV_FUEL"
-+export PRODNO ?= "OPNFV_FUEL"
- export REVSTATE = "P0000"
- export USER ?= $(shell whoami)
- export BUILD_DATE = $(shell date --utc +%Y-%m-%d:%H:%M)
--export OPNFV_GIT_SHA = $(shell git rev-parse HEAD)
-+export OPNFV_GIT_SHA ?= $(shell git rev-parse HEAD)
- # Store in /etc/fuel_build_id on fuel master
- export BUILD_ID := $(PRODNO)_$(BUILD_DATE)_$(OPNFV_GIT_SHA)
- 
diff --git a/patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch b/patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch
deleted file mode 100644
index cb07c9fc..00000000
--- a/patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Thu, 11 Aug 2016 15:34:32 +0200
-Subject: [PATCH] build: Add armband.mk config, env var ARMBAND_BASE
-
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- build/Makefile          | 10 ++++++++++
- build/armband.mk        | 53 +++++++++++++++++++++++++++++++++++++++++++++++++
- build/docker/Dockerfile |  2 +-
- build/docker/runcontext |  6 +++++-
- 4 files changed, 69 insertions(+), 2 deletions(-)
- create mode 100644 build/armband.mk
-
-diff --git a/build/Makefile b/build/Makefile
-index 4454c35..377ecc6 100644
---- a/build/Makefile
-+++ b/build/Makefile
-@@ -14,6 +14,9 @@ SHELL = /bin/bash
- # settings.
- -include environment.mk
- 
-+# Override Armband specific information & git commit references
-+-include armband.mk
-+
- ############################################################################
- # BEGIN of variables to customize
- #
-@@ -129,5 +132,8 @@ $(ISOCACHE):
- 	cd $(FUEL_MAIN_DIR) && make repos
- 	$(REPOINFO) -r $(FUEL_MAIN_DIR) > gitinfo_fuel.txt
-+	@if test -n $(ARMBAND_BASE); then \
-+		$(REPOINFO) -r $(ARMBAND_BASE) >> gitinfo_fuel.txt; \
-+	fi
- 	# OPNFV patches at Fuel build time
- 	# Need to be commited in order for them to be considered by the Fuel
- 	# build system
-@@ -228,5 +234,9 @@ debug:
- 	sha1sum fuel_build_loop >> .cachedata
- 	sha1sum config.mk >> .cachedata
-+	@if test -n $(ARMBAND_BASE); then \
-+		sha1sum armband.mk >> .cachedata; \
-+		$(REPOINFO) $(ARMBAND_BASE) >> .cachedata; \
-+	fi
- 	sha1sum Makefile >> .cachedata
- 	$(CACHETOOL) getbiweek >> .cachedata
- 	cat .cachedata | $(CACHETOOL) getid > .cacheid
-diff --git a/build/armband.mk b/build/armband.mk
-new file mode 100644
-index 0000000..1e772f0
---- /dev/null
-+++ b/build/armband.mk
-@@ -0,0 +1,54 @@
-+##############################################################################
-+# Copyright (c) 2016 Enea AB and others.
-+# Alexandru.Avadanii@enea.com
-+# All rights reserved. This program and the accompanying materials
-+# are made available under the terms of the Apache License, Version 2.0
-+# which accompanies this distribution, and is available at
-+# http://www.apache.org/licenses/LICENSE-2.0
-+##############################################################################
-+
-+# Only configure Armband stuff when ARMBAND_BASE is set
-+ifdef ARMBAND_BASE
-+    # Armband plugins, supported archs & specific info
-+    export PLUGINS           := f_odlpluginbuild f_bgpvpn-pluginbuild f_ovs-nsh-dpdk-pluginbuild
-+    export UBUNTU_ARCH       := amd64 arm64
-+    export PRODNO            := OPNFV_A_FUEL
-+    export MIRROR_MOS_UBUNTU := linux.enea.com
-+    export EXTRA_RPM_REPOS   := armband,http://linux.enea.com/mos-repos/centos/mos9.0-centos7/armband/x86_64,10
-+
-+    # Temporary fuel-plugin-builder repo info for runtime patching
-+    export FPB_REPO      := https://github.com/openstack/fuel-plugins
-+    export FPB_BRANCH    := master
-+    export FPB_CHANGE    := refs/changes/31/311031/2
-+
-+    # Armband git submodules for Fuel/OPNFV components
-+    export ASTUTE_REPO   := ${ARMBAND_BASE}/upstream/fuel-astute
-+    export ASTUTE_COMMIT := HEAD
-+
-+    export NAILGUN_REPO   := ${ARMBAND_BASE}/upstream/fuel-web
-+    export NAILGUN_COMMIT := HEAD
-+
-+    export FUEL_AGENT_REPO   := ${ARMBAND_BASE}/upstream/fuel-agent
-+    export FUEL_AGENT_COMMIT := HEAD
-+
-+    export FUEL_NAILGUN_AGENT_REPO   := ${ARMBAND_BASE}/upstream/fuel-nailgun-agent
-+    export FUEL_NAILGUN_AGENT_COMMIT := HEAD
-+
-+    export FUEL_MIRROR_REPO   := ${ARMBAND_BASE}/upstream/fuel-mirror
-+    export FUEL_MIRROR_COMMIT := HEAD
-+
-+    export FUELLIB_REPO   := ${ARMBAND_BASE}/upstream/fuel-library
-+    export FUELLIB_COMMIT := HEAD
-+
-+    export FUEL_PLUGIN_ODL_REPO        := ${ARMBAND_BASE}/upstream/fuel-plugin-opendaylight
-+    export FUEL_PLUGIN_ODL_BRANCH      := armband-workbench
-+    export FUEL_PLUGIN_ODL_CHANGE      := HEAD
-+    export OPNFV_QUAGGE_PACKAGING_REPO := https://github.com/alexandruavadanii/opnfv-quagga-packaging
-+
-+    export OVS_NSH_DPDK_REPO   := ${ARMBAND_BASE}/upstream/fuel-plugin-ovs
-+    export OVS_NSH_DPDK_BRANCH := HEAD
-+
-+    export VSPERF_REPO   := ${ARMBAND_BASE}/upstream/vswitchperf
-+    export VSPERF_BRANCH := armband-workbench
-+    export VSPERF_CHANGE := HEAD
-+endif
-diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile
-index b38ea4c..624f233 100644
---- a/build/docker/Dockerfile
-+++ b/build/docker/Dockerfile
-@@ -30,7 +30,7 @@ RUN echo "Defaults env_keep += \"ftp_proxy http_proxy https_proxy no_proxy RSYNC
- # Keeping PWD is needed to build as root
- RUN echo "Defaults env_keep += \"PWD\"" > /etc/sudoers.d/keep-pwd
- # Keeping variables for ISO build
--RUN echo "Defaults env_keep += \"MIRROR_UBUNTU MIRROR_UBUNTU_ROOT MIRROR_MOS_UBUNTU MIRROR_MOS_UBUNTU_ROOT MIRROR_FUEL LATEST_TARGET_UBUNTU UBUNTU_ARCH\"" > /etc/sudoers.d/keep-mos
-+RUN echo "Defaults env_keep += \"MIRROR_UBUNTU MIRROR_UBUNTU_ROOT MIRROR_MOS_UBUNTU MIRROR_MOS_UBUNTU_ROOT MIRROR_FUEL LATEST_TARGET_UBUNTU UBUNTU_ARCH ARMBAND_BASE\"" > /etc/sudoers.d/keep-mos
- RUN chmod 0440 /etc/sudoers.d/open-sudo
- RUN chmod 0440 /etc/sudoers.d/keep-proxies
- RUN chmod 0440 /etc/sudoers.d/keep-pwd
-diff --git a/build/docker/runcontext b/build/docker/runcontext
-index daad663..e4874df 100755
---- a/build/docker/runcontext
-+++ b/build/docker/runcontext
-@@ -42,6 +42,10 @@ GITROOT=`git rev-parse --show-toplevel`
- CID_FILE=`mktemp -u -t runcontext.XXXXXXXXXX`
- CONTEXT_DIR=`mktemp -d ${GITROOT}/.docker_contextXXXXXX`
- 
-+if [[ $ARMBAND_BASE ]]; then
-+    GITROOT=$ARMBAND_BASE
-+fi
-+
- # If RSYNC_CONNECT_PROG is used, we need to copy all of
- # the SSH structure, should one of the keys need to be
- # used.
-@@ -115,7 +119,7 @@ RUN_CONTEXT_OPT="--cidfile $CID_FILE --privileged=true --rm \
-     -e HOME=$HOME -e CACHEDEBUG -e CACHETRANSPORT -e CACHEMAXAGE -e CACHEBASE \
-     -e BUILD_FUEL_PLUGINS -e MIRROR_UBUNTU -e MIRROR_UBUNTU_ROOT \
-     -e MIRROR_MOS_UBUNTU -e MIRROR_MOS_UBUNTU_ROOT -e MIRROR_FUEL \
--    -e LATEST_TARGET_UBUNTU -e UBUNTU_ARCH \
-+    -e LATEST_TARGET_UBUNTU -e UBUNTU_ARCH -e ARMBAND_BASE \
-     -u $USER_ID:$GROUP_ID -w $PWD \
-     -v $GITROOT:$GITROOT -v /sys/fs/cgroup:/sys/fs/cgroup:ro $CACHEMOUNT"
- 
diff --git a/patches/opnfv-fuel/0028-bootstrap-Add-lshw-package.patch b/patches/opnfv-fuel/arm64-bug-fixes/0001-bootstrap-Add-lshw-package.patch
index a811f2f3..61578bfe 100644
--- a/patches/opnfv-fuel/0028-bootstrap-Add-lshw-package.patch
+++ b/patches/opnfv-fuel/arm64-bug-fixes/0001-bootstrap-Add-lshw-package.patch
@@ -17,10 +17,11 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml b/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml
-index 15d9e9d..b45a14a 100644
+index fcf4257..264ae0e 100644
 --- a/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml
 +++ b/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml
-@@ -17,5 +17,6 @@
+@@ -24,6 +24,7 @@
+     - linux-headers-generic
      - live-boot
      - live-boot-initramfs-tools
 +    - lshw
diff --git a/patches/opnfv-fuel/0054-net-check-add-support-for-faulty-operstate.patch b/patches/opnfv-fuel/arm64-bug-fixes/0002-net-check-add-support-for-faulty-operstate.patch
index 8a765c92..a7006fcc 100644
--- a/patches/opnfv-fuel/0054-net-check-add-support-for-faulty-operstate.patch
+++ b/patches/opnfv-fuel/arm64-bug-fixes/0002-net-check-add-support-for-faulty-operstate.patch
@@ -15,13 +15,13 @@ Signed-off-by: Stefan Sicleru <stefan.sicleru@enea.com>
 ---
  ...et-check-add-support-for-faulty-operstate.patch | 38 ++++++++++++++++++++++
  1 file changed, 38 insertions(+)
- create mode 100644 build/patch-repos/build/repos/network-checker/0010-net-check-add-support-for-faulty-operstate.patch
+ create mode 100644 build/f_repos/patch/network-checker/0010-net-check-add-support-for-faulty-operstate.patch
 
-diff --git a/build/patch-repos/build/repos/network-checker/0010-net-check-add-support-for-faulty-operstate.patch b/build/patch-repos/build/repos/network-checker/0010-net-check-add-support-for-faulty-operstate.patch
+diff --git a/build/f_repos/patch/network-checker/0010-net-check-add-support-for-faulty-operstate.patch b/build/f_repos/patch/network-checker/0010-net-check-add-support-for-faulty-operstate.patch
 new file mode 100644
 index 0000000..71e7b73
 --- /dev/null
-+++ b/build/patch-repos/build/repos/network-checker/0010-net-check-add-support-for-faulty-operstate.patch
++++ b/build/f_repos/patch/network-checker/0010-net-check-add-support-for-faulty-operstate.patch
 @@ -0,0 +1,38 @@
 +From: Stefan Sicleru <stefan.sicleru@enea.com>
 +Date: Tue, 30 Aug 2016 17:30:24 +0200
@@ -58,6 +58,6 @@ index 0000000..71e7b73
 ++            return 'Link detected: yes' in '\n'.join(output).replace('\n', ' ')
 ++
 ++        return False
-+ 
++
 +     def _ensure_iface_up(self, iface, vid=None):
 +         """Ensures interface is with vid up."""
diff --git a/patches/opnfv-fuel/0027-UX-Update-bootstrap-target-build-time-estimate.patch b/patches/opnfv-fuel/cross-bootstrap/0001-UX-Update-bootstrap-target-build-time-estimate.patch
index fe623957..91ba18a0 100644
--- a/patches/opnfv-fuel/0027-UX-Update-bootstrap-target-build-time-estimate.patch
+++ b/patches/opnfv-fuel/cross-bootstrap/0001-UX-Update-bootstrap-target-build-time-estimate.patch
@@ -8,14 +8,15 @@ introduced by using qemu-user-static.
 
 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
 ---
- build/bootstrap_admin_node.sh.patch | 23 +++++++++++++++++++++++
- 1 file changed, 23 insertions(+)
+ .../0001-OPNFV-Additions-to-bootstrap_admin_node.sh.patch | 15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
 
-diff --git a/build/patch-repos/0010-bootstrap_admin_node.sh.patch b/build/patch-repos/0010-bootstrap_admin_node.sh.patch
-index c66b497..46b53e6 100644
---- a/build/patch-repos/0010-bootstrap_admin_node.sh.patch
-+++ b/build/patch-repos/0010-bootstrap_admin_node.sh.patch
-@@ -8,5 +8,20 @@
+diff --git a/build/f_repos/patch/fuel-main/0001-OPNFV-Additions-to-bootstrap_admin_node.sh.patch b/build/f_repos/patch/fuel-main/0001-OPNFV-Additions-to-bootstrap_admin_node.sh.patch
+index 446d0b6..c2e664c 100644
+--- a/build/f_repos/patch/fuel-main/0001-OPNFV-Additions-to-bootstrap_admin_node.sh.patch
++++ b/build/f_repos/patch/fuel-main/0001-OPNFV-Additions-to-bootstrap_admin_node.sh.patch
+@@ -10,6 +10,21 @@ diff --git a/iso/bootstrap_admin_node.sh b/iso/bootstrap_admin_node.sh
+ index 3197c91..db3123d 100755
  --- a/iso/bootstrap_admin_node.sh
  +++ b/iso/bootstrap_admin_node.sh
 +@@ -86,9 +86,11 @@
diff --git a/patches/opnfv-fuel/0021-Build-bootstrap-image-for-arm64.patch b/patches/opnfv-fuel/cross-bootstrap/0002-Build-bootstrap-image-for-arm64.patch
index 4daf733e..836cb2cf 100644
--- a/patches/opnfv-fuel/0021-Build-bootstrap-image-for-arm64.patch
+++ b/patches/opnfv-fuel/cross-bootstrap/0002-Build-bootstrap-image-for-arm64.patch
@@ -1,4 +1,4 @@
-From: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com>
+From: Stanislaw Kardach <stanislaw.kardach@cavium.com>
 Date: Thu, 3 Mar 2016 19:04:07 +0100
 Subject: [PATCH] Build bootstrap image for arm64
 
@@ -6,13 +6,15 @@ For now the arch is hardcoded for simplicity. We should detect this
 but how? If we're multi-arch then one bootstrap image should be built
 per supported arch. This requires Fuel refactoring.
 ---
- build/bootstrap_admin_node.sh.patch | 17 +++++++++++++++++
- 1 file changed, 17 insertions(+)
+ .../0001-OPNFV-Additions-to-bootstrap_admin_node.sh.patch        | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/build/f_repos/patch/fuel-main/0001-OPNFV-Additions-to-bootstrap_admin_node.sh.patch b/build/f_repos/patch/fuel-main/0001-OPNFV-Additions-to-bootstrap_admin_node.sh.patch
+index c2e664c..12d0dfb 100644
+--- a/build/f_repos/patch/fuel-main/0001-OPNFV-Additions-to-bootstrap_admin_node.sh.patch
++++ b/build/f_repos/patch/fuel-main/0001-OPNFV-Additions-to-bootstrap_admin_node.sh.patch
+@@ -73,6 +73,15 @@ index 3197c91..db3123d 100755
 
-diff --git a/build/patch-repos/0010-bootstrap_admin_node.sh.patch b/build/patch-repos/0010-bootstrap_admin_node.sh.patch
---- a/build/patch-repos/0010-bootstrap_admin_node.sh.patch
-+++ b/build/patch-repos/0010-bootstrap_admin_node.sh.patch
-@@ -53,3 +53,12 @@
   # Enable iptables
   systemctl enable iptables.service
 +@@ -484,7 +490,7 @@
@@ -25,3 +27,5 @@ diff --git a/build/patch-repos/0010-bootstrap_admin_node.sh.patch b/build/patch-
 +           fuel notify --topic "done" --send "${bs_done_message}"
 +         else
  @@ -532,6 +545,16 @@ systemctl start ntpd
+
+  bash /etc/rc.local
diff --git a/patches/opnfv-fuel/0022-bootstrap-Use-public-Ubuntu-ports-mirrors.patch b/patches/opnfv-fuel/cross-bootstrap/0003-bootstrap-Use-public-Ubuntu-ports-mirrors.patch
index ff13b39b..157306b2 100644
--- a/patches/opnfv-fuel/0022-bootstrap-Use-public-Ubuntu-ports-mirrors.patch
+++ b/patches/opnfv-fuel/cross-bootstrap/0003-bootstrap-Use-public-Ubuntu-ports-mirrors.patch
@@ -14,10 +14,10 @@ current config.
  1 file changed, 4 insertions(+), 3 deletions(-)
 
 diff --git a/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml b/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml
-index aa12c45..2e4843d 100644
+index 264ae0e..17e161f 100644
 --- a/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml
 +++ b/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml
-@@ -36,19 +36,19 @@
+@@ -49,19 +49,19 @@
    repos:
      - name: ubuntu
        section: "main universe multiverse"
@@ -40,7 +40,9 @@ index aa12c45..2e4843d 100644
        priority:
        suite: trusty-security
        type: deb
-@@ -60,2 +60,3 @@
+@@ -73,4 +73,5 @@
+       type: deb
+   skip_default_img_build: false
    direct_repo_addresses:
 +    - "ports.ubuntu.com"
      - "127.0.0.1"
diff --git a/patches/opnfv-fuel/0031-post-scripts-Enable-systemd-binfmt-for-first-boot.patch b/patches/opnfv-fuel/cross-bootstrap/0004-post-scripts-Enable-systemd-binfmt-for-first-boot.patch
index 03e877a1..26b898fe 100644
--- a/patches/opnfv-fuel/0031-post-scripts-Enable-systemd-binfmt-for-first-boot.patch
+++ b/patches/opnfv-fuel/cross-bootstrap/0004-post-scripts-Enable-systemd-binfmt-for-first-boot.patch
@@ -25,37 +25,14 @@ automatically started. Of course, this only affects the first boot.
 Finally, this commit adds an OPNFV post-install script in
 /opt/opnfv/bootstrap/post.d, which starts systemd-binfmt service.
 ---
- build/bootstrap_admin_node.sh.patch                | 15 ++++++++++
  .../post-scripts/80_prepare_cross_builds.sh        | 32 ++++++++++++++++++++++
- 2 files changed, 47 insertions(+)
+ ...PNFV-Additions-to-bootstrap_admin_node.sh.patch | 13 +++++++++
+ 2 files changed, 45 insertions(+)
  create mode 100755 build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh
 
-diff --git a/build/patch-repos/0010-bootstrap_admin_node.sh.patch b/build/patch-repos/0010-bootstrap_admin_node.sh.patch
-index b1ea90b..7f16d0b 100644
---- a/build/patch-repos/0010-bootstrap_admin_node.sh.patch
-+++ b/build/patch-repos/0010-bootstrap_admin_node.sh.patch
-@@ -24,5 +24,18 @@
-  nodes over PXE, they will be discovered and become available for installing \
-  OpenStack on them"
-+@@ -239,6 +239,12 @@
-+ # /etc/fuel_openstack_version is provided by 'fuel-openstack-metadata' package
-+ OPENSTACK_VERSION=$(cat /etc/fuel_openstack_version)
-+
-++# FIXME(armband): This part might be moved to an earlier stage later
-++# /etc/fuel_openstack_arch is constructed based on local mirror metadata
-++grep -oP "^Architectures: \K.*$" \
-++    ${wwwdir}/${OPENSTACK_VERSION}/ubuntu/x86_64/dists/mos${FUEL_RELEASE}/Release > \
-++    /etc/fuel_openstack_arch
-++
-+ # We do not ship debian-installer kernel and initrd on ISO.
-+ # But we still need to be able to create ubuntu cobbler distro
-+ # which requires kernel and initrd to be available. So, we
- @@ -339,8 +339,22 @@ fuelmenu --save-only --iface=$ADMIN_INTERFACE || fail
-  set +x
-  echo "Done!"
 diff --git a/build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh b/build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh
 new file mode 100755
-index 0000000..d33d1d1
+index 0000000..01eb2e2
 --- /dev/null
 +++ b/build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh
 @@ -0,0 +1,32 @@
@@ -91,3 +68,27 @@ index 0000000..d33d1d1
 +fi
 +
 +echo "Done preparing cross-building"
+diff --git a/build/f_repos/patch/fuel-main/0001-OPNFV-Additions-to-bootstrap_admin_node.sh.patch b/build/f_repos/patch/fuel-main/0001-OPNFV-Additions-to-bootstrap_admin_node.sh.patch
+index 12d0dfb..81d196b 100644
+--- a/build/f_repos/patch/fuel-main/0001-OPNFV-Additions-to-bootstrap_admin_node.sh.patch
++++ b/build/f_repos/patch/fuel-main/0001-OPNFV-Additions-to-bootstrap_admin_node.sh.patch
+@@ -25,6 +25,19 @@ index 3197c91..db3123d 100755
+  bs_done_message="Default bootstrap image building done. Now you can boot new \
+  nodes over PXE, they will be discovered and become available for installing \
+  OpenStack on them"
++@@ -239,6 +239,12 @@
++ # /etc/fuel_openstack_version is provided by 'fuel-openstack-metadata' package
++ OPENSTACK_VERSION=$(cat /etc/fuel_openstack_version)
++
+++# FIXME(armband): This part might be moved to an earlier stage later
+++# /etc/fuel_openstack_arch is constructed based on local mirror metadata
+++grep -oP "^Architectures: \K.*$" \
+++    ${wwwdir}/${OPENSTACK_VERSION}/ubuntu/x86_64/dists/mos${FUEL_RELEASE}/Release > \
+++    /etc/fuel_openstack_arch
+++
++ # We do not ship debian-installer kernel and initrd on ISO.
++ # But we still need to be able to create ubuntu cobbler distro
++ # which requires kernel and initrd to be available. So, we
+ @@ -339,8 +339,22 @@ fuelmenu --save-only --iface=$ADMIN_INTERFACE || fail
+  set +x
+  echo "Done!"
diff --git a/patches/opnfv-fuel/0032-mcagent-Increase-max-shell-command-timeout-to-2h.patch b/patches/opnfv-fuel/cross-bootstrap/0005-mcagent-Increase-max-shell-command-timeout-to-2h.patch
index f5fc4cf1..c04cc8ab 100644
--- a/patches/opnfv-fuel/0032-mcagent-Increase-max-shell-command-timeout-to-2h.patch
+++ b/patches/opnfv-fuel/cross-bootstrap/0005-mcagent-Increase-max-shell-command-timeout-to-2h.patch
@@ -16,14 +16,14 @@ for mcagent has to be increased.
 [ Alexandru Avadanii ]
 Repackaged, based on Stan's `fuel-astute` patch.
 
-Signed-off-by: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com>
+Signed-off-by: Stanislaw Kardach <stanislaw.kardach@cavium.com>
 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
 ---
  .../f_bootstrap/post-scripts/80_prepare_cross_builds.sh    | 14 ++++++++++++++
  1 file changed, 14 insertions(+)
 
 diff --git a/build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh b/build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh
-index d33d1d1..d78b850 100755
+index 01eb2e2..12f66e6 100755
 --- a/build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh
 +++ b/build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh
 @@ -26,6 +26,20 @@ if which dpkg > /dev/null 2>&1; then
@@ -46,4 +46,4 @@ index d33d1d1..d78b850 100755
 +      /usr/libexec/mcollective/mcollective/agent/execute_shell_command.ddl
    fi
  fi
- 
+
diff --git a/patches/opnfv-fuel/0033-bootstrap-Use-gzip-instead-of-xz-compression.patch b/patches/opnfv-fuel/cross-bootstrap/0006-bootstrap-Use-gzip-instead-of-xz-compression.patch
index e7b176b9..ccbd3e1c 100644
--- a/patches/opnfv-fuel/0033-bootstrap-Use-gzip-instead-of-xz-compression.patch
+++ b/patches/opnfv-fuel/cross-bootstrap/0006-bootstrap-Use-gzip-instead-of-xz-compression.patch
@@ -14,13 +14,13 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  1 file changed, 19 insertions(+)
 
 diff --git a/build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh b/build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh
-index 3839d62..7ceaacc 100755
+index 12f66e6..3cb22f3 100755
 --- a/build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh
 +++ b/build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh
 @@ -27,6 +27,11 @@ if which dpkg > /dev/null 2>&1; then
        exit 1
      fi
- 
+
 +    # Determine python site-packages directory location
 +    PYTHON_SITEPKGS_DIR=$(python -c \
 +      "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
@@ -49,4 +49,4 @@ index 3839d62..7ceaacc 100755
 +    fi
    fi
  fi
- 
+
diff --git a/patches/opnfv-fuel/0034-Nailgun-Increase-target-image-build-timeout.patch b/patches/opnfv-fuel/cross-bootstrap/0007-Nailgun-Increase-target-image-build-timeout.patch
index 2fbe680a..19a025f7 100644
--- a/patches/opnfv-fuel/0034-Nailgun-Increase-target-image-build-timeout.patch
+++ b/patches/opnfv-fuel/cross-bootstrap/0007-Nailgun-Increase-target-image-build-timeout.patch
@@ -10,14 +10,14 @@ to be safer.
 [ Alexandru Avadanii ]
 Moved original patch wrote by Stan to post-install.
 
-Signed-off-by: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com>
+Signed-off-by: Stanislaw Kardach <stanislaw.kardach@cavium.com>
 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
 ---
  .../f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh  | 7 +++++++
  1 file changed, 7 insertions(+)
 
 diff --git a/build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh b/build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh
-index 7ceaacc..0435a28 100755
+index 3cb22f3..c106bc3 100755
 --- a/build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh
 +++ b/build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh
 @@ -45,6 +45,13 @@ if which dpkg > /dev/null 2>&1; then
@@ -31,6 +31,6 @@ index 7ceaacc..0435a28 100755
 +        ${PYTHON_SITEPKGS_DIR}/nailgun/settings.yaml
 +      echo "INFO: [1h] => [2h] updated nailgun image build timeout."
 +    fi
- 
+
      # Bootstrap: Use gzip instead of xz compression.
      #
diff --git a/patches/opnfv-fuel/0035-m1.micro-Increase-profile-RAM-size-to-128MB.patch b/patches/opnfv-fuel/cross-bootstrap/0008-m1.micro-Increase-profile-RAM-size-to-128MB.patch
index 89720a2b..a54222a4 100644
--- a/patches/opnfv-fuel/0035-m1.micro-Increase-profile-RAM-size-to-128MB.patch
+++ b/patches/opnfv-fuel/cross-bootstrap/0008-m1.micro-Increase-profile-RAM-size-to-128MB.patch
@@ -11,7 +11,7 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  1 file changed, 15 insertions(+)
 
 diff --git a/build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh b/build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh
-index 0435a28..078f117 100755
+index c106bc3..0b48ca2 100755
 --- a/build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh
 +++ b/build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh
 @@ -66,6 +66,21 @@ if which dpkg > /dev/null 2>&1; then
@@ -35,4 +35,4 @@ index 0435a28..078f117 100755
 +    fi
    fi
  fi
- 
+
diff --git a/patches/opnfv-fuel/0001-kernel-flavor-linux-image-generic-lts-xenial.patch b/patches/opnfv-fuel/kernel-bump/0001-kernel-flavor-linux-image-generic-lts-xenial.patch
index 70847ba7..c3a8da4a 100644
--- a/patches/opnfv-fuel/0001-kernel-flavor-linux-image-generic-lts-xenial.patch
+++ b/patches/opnfv-fuel/kernel-bump/0001-kernel-flavor-linux-image-generic-lts-xenial.patch
@@ -13,10 +13,10 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  2 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml b/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml
-index daef3d5..2985619 100644
+index 17e161f..fb0ad1a 100644
 --- a/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml
 +++ b/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml
-@@ -5,7 +5,7 @@
+@@ -13,7 +13,7 @@
    extra_dirs:
      - /usr/share/fuel_bootstrap_cli/files/trusty
    output_dir: /tmp/
@@ -25,7 +25,7 @@ index daef3d5..2985619 100644
    packages:
      - fuel-agent
      - hwloc
-@@ -13,6 +13,6 @@
+@@ -21,7 +21,7 @@
      - i40e-dkms
      - linux-firmware
      - linux-firmware-nonfree
@@ -33,19 +33,20 @@ index daef3d5..2985619 100644
 +    - linux-headers-generic-lts-xenial
      - live-boot
      - live-boot-initramfs-tools
+     - lshw
 diff --git a/deploy/config/dea_base.yaml b/deploy/config/dea_base.yaml
-index 658b328..5f3c156 100644
+index 5a25040..f5a03e2 100644
 --- a/deploy/config/dea_base.yaml
 +++ b/deploy/config/dea_base.yaml
 @@ -474,9 +474,9 @@ settings:
- 
+
            linux-firmware-nonfree
- 
+
 -          linux-headers-generic-lts-trusty
 +          linux-headers-generic-lts-xenial
- 
+
 -          linux-image-generic-lts-trusty
 +          linux-image-generic-lts-xenial
- 
+
            lvm2
- 
+
diff --git a/patches/opnfv-fuel/0002-FIXME-deploy-EFI-Skip-re-ordering-boot-via-IPMI.patch b/patches/opnfv-fuel/multiarch-efi/0001-FIXME-deploy-EFI-Skip-re-ordering-boot-via-IPMI.patch
index d6ff3818..3b3c612a 100644
--- a/patches/opnfv-fuel/0002-FIXME-deploy-EFI-Skip-re-ordering-boot-via-IPMI.patch
+++ b/patches/opnfv-fuel/multiarch-efi/0001-FIXME-deploy-EFI-Skip-re-ordering-boot-via-IPMI.patch
@@ -19,7 +19,7 @@ index 93dc395..1d2dfeb 100644
 --- a/deploy/deploy_env.py
 +++ b/deploy/deploy_env.py
 @@ -255,7 +255,9 @@ class CloudDeploy(object):
- 
+
      def set_boot_order_nodes(self):
          self.power_off_nodes()
 -        self.set_boot_order(['pxe', 'disk'])
@@ -27,5 +27,5 @@ index 93dc395..1d2dfeb 100644
 +        # Until we choose an uniform design on EFI systems, just disable it
 +        # self.set_boot_order(['pxe', 'disk'])
          self.power_on_nodes()
- 
+
      def get_put_deploy_log(self):
diff --git a/patches/opnfv-fuel/0020-Add-arm64-deb-repositories-setup.patch b/patches/opnfv-fuel/multiarch-mirrors/0001-Add-arm64-deb-repositories-setup.patch
index 9083ceb1..c3a76d1e 100644
--- a/patches/opnfv-fuel/0020-Add-arm64-deb-repositories-setup.patch
+++ b/patches/opnfv-fuel/multiarch-mirrors/0001-Add-arm64-deb-repositories-setup.patch
@@ -1,4 +1,4 @@
-From: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com>
+From: Stanislaw Kardach <stanislaw.kardach@cavium.com>
 Date: Wed, 24 Feb 2016 20:04:03 +0100
 Subject: [PATCH] Add arm64 deb repositories setup
 
@@ -12,7 +12,7 @@ Subject: [PATCH] Add arm64 deb repositories setup
  6 files changed, 52 insertions(+), 15 deletions(-)
 
 diff --git a/build/f_isoroot/f_kscfg/ks.cfg.patch b/build/f_isoroot/f_kscfg/ks.cfg.patch
-index a6840e4..e1ae8fc 100644
+index a6840e4..84a241f 100644
 --- a/build/f_isoroot/f_kscfg/ks.cfg.patch
 +++ b/build/f_isoroot/f_kscfg/ks.cfg.patch
 @@ -1,6 +1,16 @@
@@ -22,7 +22,7 @@ index a6840e4..e1ae8fc 100644
 +*** 448,453 ****
 +--- 448,454 ----
 +  cp ${SOURCE}/.treeinfo ${repodir}/centos/x86_64
-+  
++
 +  # Copying Ubuntu files
 ++ # FIXME: This is missleading as dist/pool may contain multiple arch!
 +  mkdir -p ${repodir}/ubuntu/x86_64/images
@@ -39,14 +39,14 @@ index 0d15aec..e6392f8 100644
 @@ -16,12 +16,18 @@ TreeDefault {
    Directory "pool";
  };
- 
+
 -BinDirectory "pool/main" {
 +BinDirectory "pool/main/binary-amd64" {
    Packages "dists/trusty/main/binary-amd64/Packages";
    BinOverride "./indices/override.trusty.main";
    ExtraOverride "./indices/override.trusty.extra.main";
  };
- 
+
 +BinDirectory "pool/main/binary-arm64" {
 +  Packages "dists/trusty/main/binary-arm64/Packages";
 +  BinOverride "./indices/override.trusty.main";
@@ -75,13 +75,13 @@ index 3b5b239..c6ab4fb 100644
 @@ -16,11 +16,16 @@ TreeDefault {
    Directory "pool";
  };
- 
+
 -BinDirectory "pool/debian-installer" {
 +BinDirectory "pool/debian-installer/binary-amd64" {
    Packages "dists/trusty/main/debian-installer/binary-amd64/Packages";
    BinOverride "./indices/override.trusty.main.debian-installer";
  };
- 
+
 +BinDirectory "pool/debian-installer/binary-arm64" {
 +  Packages "dists/trusty/main/debian-installer/binary-arm64/Packages";
 +  BinOverride "./indices/override.trusty.main.debian-installer";
@@ -91,13 +91,13 @@ index 3b5b239..c6ab4fb 100644
    Packages {
      Extensions ".udeb";
 diff --git a/build/install/install.sh b/build/install/install.sh
-index 4e0389e..8c29e08 100755
+index 866d304..9e003bb 100755
 --- a/build/install/install.sh
 +++ b/build/install/install.sh
 @@ -122,12 +122,24 @@ prep_make_live() {
      ssh-copy-id root@$FUELHOST
      sshfs root@1${FUELHOST}:/ $TMP_HOSTMOUNT
- 
+
 -    if [ -f  $REPO/dists/trusty/main/binary-amd64/Packages.backup ]; then
 +    for arch in arm64 amd64; do
 +    if [ -f  $REPO/dists/trusty/main/binary-${arch}/Packages.backup ]; then
@@ -115,7 +115,7 @@ index 4e0389e..8c29e08 100755
          echo "Error - found backup file for Packages!"
          exit 1
      fi
- 
+
 -    if [ -f  $REPO/dists/trusty/main/binary-amd64/Packages.gz.backup ]; then
 +    if [ -f  $REPO/dists/trusty/main/binary-arm64/Packages.gz.backup ]; then
          echo "Error - found backup file for Packages.gz!"
@@ -124,7 +124,7 @@ index 4e0389e..8c29e08 100755
 @@ -142,8 +154,10 @@ prep_make_live() {
          exit 1
      fi
- 
+
 -    cp $REPO/dists/trusty/main/binary-amd64/Packages $REPO/dists/trusty/main/binary-amd64/Packages.backup
 -    cp $REPO/dists/trusty/main/binary-amd64/Packages.gz $REPO/dists/trusty/main/binary-amd64/Packages.gz.backup
 +    for arch in arm64 amd64; do
@@ -140,7 +140,7 @@ index a9e74bc..e90c632 100755
 +++ b/build/install/uninstall.sh
 @@ -31,15 +31,17 @@ DEST=$MOUNT
  REPO=$DEST/var/www/nailgun/ubuntu/fuelweb/x86_64
- 
+
  cd $REPO
 -if [ ! -f  $REPO/dists/trusty/main/binary-amd64/Packages.backup ]; then
 -    echo "Error - didn't find backup file for Packages!"
@@ -151,7 +151,7 @@ index a9e74bc..e90c632 100755
 +        echo "Error - didn't find backup file for Packages for ${arch}!"
 +        exit 1
 +    fi
- 
+
 -if [ ! -f  $REPO/dists/trusty/main/binary-amd64/Packages.gz.backup ]; then
 -    echo "Error - didn't find backup file for Packages.gz!"
 -    exit 1
@@ -161,6 +161,6 @@ index a9e74bc..e90c632 100755
 +        exit 1
 +    fi
 +done
- 
+
  if [ ! -f  $REPO/dists/trusty/Release.backup ]; then
      echo "Error - didn't find backup file for Release!"
diff --git a/patches/opnfv-fuel/0048-fpb-Support-multiple-versions-of-packages.patch b/patches/opnfv-fuel/multiarch-plugins/0001-fpb-Support-multiple-versions-of-packages.patch
index 25187b4e..35bef5c8 100644
--- a/patches/opnfv-fuel/0048-fpb-Support-multiple-versions-of-packages.patch
+++ b/patches/opnfv-fuel/multiarch-plugins/0001-fpb-Support-multiple-versions-of-packages.patch
@@ -19,7 +19,7 @@ index 624f233..ab0d0d3 100644
 +++ b/build/docker/Dockerfile
 @@ -23,7 +23,14 @@ RUN apt-get install -y software-properties-common python-software-properties \
      build-essential ruby-dev rubygems-integration python-pip git rpm createrepo dpkg-dev
- 
+
  RUN gem install fpm
 -RUN pip install fuel-plugin-builder
 +
@@ -30,14 +30,16 @@ index 624f233..ab0d0d3 100644
 +        (git fetch origin INSERT_FPB_CHANGE && git checkout FETCH_HEAD)) && \
 +    python setup.py sdist && pip install ./dist/fuel-plugin-builder-*.tar.gz && \
 +    cd .. && rm -rf fuel-plugins
- 
+
  RUN echo "ALL ALL=NOPASSWD: ALL" > /etc/sudoers.d/open-sudo
  RUN echo "Defaults env_keep += \"ftp_proxy http_proxy https_proxy no_proxy RSYNC_PROXY RSYNC_CONNECT_PROG npm_config_registry\"" > /etc/sudoers.d/keep-proxies
 diff --git a/build/docker/Makefile b/build/docker/Makefile
-index d4423b0..226bbd0 100644
+index 783881e..74f6346 100644
 --- a/build/docker/Makefile
 +++ b/build/docker/Makefile
-@@ -25,4 +25,8 @@ all:	.docker
+@@ -34,6 +34,10 @@ all:	.docker
+
+ .dockercfg: $(FILES)
  	cp Dockerfile ubuntu-builder/Dockerfile
 +	# Only add FPB ENVs when set - needed to fetch, patch and install FPB
 +	test -n "${FPB_REPO}" && sed -i "s;INSERT_FPB_REPO;${FPB_REPO};" ubuntu-builder/Dockerfile || exit 0
diff --git a/patches/opnfv-fuel/0007-Remove-check-for-root.patch b/patches/opnfv-fuel/upstream-backports/0001-deploy.sh-Remove-check-for-root-rm-umask-0000.patch
index 2282f59d..cd30166a 100644
--- a/patches/opnfv-fuel/0007-Remove-check-for-root.patch
+++ b/patches/opnfv-fuel/upstream-backports/0001-deploy.sh-Remove-check-for-root-rm-umask-0000.patch
@@ -1,25 +1,39 @@
-From b7d5f0ca9a76de6d99fc5d6f5cbb8df864c62b7b Mon Sep 17 00:00:00 2001
-From: Josep Puigdemont <josep.puigdemont@enea.com>
-Date: Wed, 4 May 2016 14:27:23 +0200
-Subject: [PATCH] Remove check for root
+From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+Date: Fri, 6 May 2016 03:07:40 +0200
+Subject: [PATCH] deploy.sh: Remove check for root (rm umask 0000)
+
+Patch(es) by Josep, signed by Alex only for upstreaming.
+
+[Alexandru Avadanii]
+Squashed two atomic commits into one change.
 
-Change-Id: Ic6bfaf07c0d9d347aec2df8724184d0314665503
 Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
+Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
 ---
- ci/deploy.sh                        | 5 -----
- deploy/deploy-config.py             | 1 -
- deploy/deploy.py                    | 2 --
- deploy/environments/virtual_fuel.py | 2 --
- 4 files changed, 10 deletions(-)
+ ci/deploy.sh                        | 11 -----------
+ deploy/deploy-config.py             |  1 -
+ deploy/deploy.py                    |  2 --
+ deploy/environments/virtual_fuel.py |  2 --
+ 4 files changed, 16 deletions(-)
 
 diff --git a/ci/deploy.sh b/ci/deploy.sh
-index c08a94b..081806c 100755
+index 8411714..081806c 100755
 --- a/ci/deploy.sh
 +++ b/ci/deploy.sh
-@@ -209,11 +209,6 @@ do
+@@ -84,9 +84,6 @@ Input parameters to the build script is:
+ -i .iso image to be deployed (needs to be provided in a URI
+    style, it can be a local resource: file:// or a remote resource http(s)://)
+
+-NOTE: Root priviledges are needed for this script to run
+-
+-
+ Examples:
+ sudo `basename $0` -b file:///home/jenkins/lab-config -l lf -p pod1 -s ha_odl-l3_heat_ceilometer -i file:///home/jenkins/myiso.iso
+ EOF
+@@ -212,11 +209,6 @@ do
      esac
  done
- 
+
 -if [[ $EUID -ne 0 ]]; then
 -    echo "This script must be run as root" 1>&2
 -    exit 1
@@ -28,33 +42,43 @@ index c08a94b..081806c 100755
  if [ -z $BASE_CONFIG_URI ] || [ -z $TARGET_LAB ] || \
     [ -z $TARGET_POD ] || [ -z $DEPLOY_SCENARIO ] || \
     [ -z $ISO ]; then
+@@ -231,9 +223,6 @@ fi
+ # Enable the automatic exit trap
+ trap do_exit SIGINT SIGTERM EXIT
+
+-# Set no restrictive umask so that Jenkins can removeeee any residuals
+-umask 0000
+-
+ clean
+
+ pushd ${DEPLOY_DIR} > /dev/null
 diff --git a/deploy/deploy-config.py b/deploy/deploy-config.py
-index 65d51b2..88a1111 100644
+index 2a09aa3..02debe2 100644
 --- a/deploy/deploy-config.py
 +++ b/deploy/deploy-config.py
-@@ -40,7 +40,6 @@ from common import (
+@@ -41,7 +41,6 @@ from common import (
      check_file_exists,
      create_dir_if_not_exists,
      delete,
 -    check_if_root,
      ArgParser,
  )
- 
+
 diff --git a/deploy/deploy.py b/deploy/deploy.py
-index 56e5bd5..a021e28 100755
+index fe213e5..08702d2 100755
 --- a/deploy/deploy.py
 +++ b/deploy/deploy.py
-@@ -33,7 +33,6 @@ from common import (
+@@ -34,7 +34,6 @@ from common import (
      check_dir_exists,
      create_dir_if_not_exists,
      delete,
 -    check_if_root,
      ArgParser,
  )
- 
-@@ -234,7 +233,6 @@ class AutoDeploy(object):
+
+@@ -252,7 +251,6 @@ class AutoDeploy(object):
          return 0
- 
+
      def run(self):
 -        check_if_root()
          if self.cleanup_only:
@@ -74,12 +98,9 @@ index b1a76e4..4ff68f6 100644
  )
 @@ -135,7 +134,6 @@ class VirtualFuel(ExecutionEnvironment):
                         vm_definition_overwrite)
- 
+
      def setup_environment(self):
 -        check_if_root()
          self.cleanup_environment()
          self.create_vm()
- 
--- 
-2.5.5
 
diff --git a/patches/opnfv-fuel/0040-Backport-dpkg-checkbuilddeps-to-mk-build-deps.patch b/patches/opnfv-fuel/upstream-backports/0002-Backport-dpkg-checkbuilddeps-to-mk-build-deps.patch
index 5dde448f..eb81942e 100644
--- a/patches/opnfv-fuel/0040-Backport-dpkg-checkbuilddeps-to-mk-build-deps.patch
+++ b/patches/opnfv-fuel/upstream-backports/0002-Backport-dpkg-checkbuilddeps-to-mk-build-deps.patch
@@ -9,14 +9,14 @@ Backported from [1].
 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
 ---
  ...ce-dpkg-checkbuilddeps-with-mk-build-deps.patch | 38 ++++++++++++++++++++++
- 1 files changed, 38 insertions(+)
- create mode 100644 build/replace-dpkg-checkbuilddeps-with-mk-build-deps.patch
+ 1 file changed, 38 insertions(+)
+ create mode 100644 build/f_repos/patch/fuel-main/0005-replace-dpkg-checkbuilddeps-with-mk-build-deps.patch
 
-diff --git a/build/patch-repos/0040-replace-dpkg-checkbuilddeps-with-mk-build-deps.patch b/build/patch-repos/0040-replace-dpkg-checkbuilddeps-with-mk-build-deps.patch
+diff --git a/build/f_repos/patch/fuel-main/0005-replace-dpkg-checkbuilddeps-with-mk-build-deps.patch b/build/f_repos/patch/fuel-main/0005-replace-dpkg-checkbuilddeps-with-mk-build-deps.patch
 new file mode 100644
 index 0000000..896f3cf
 --- /dev/null
-+++ b/build/patch-repos/0040-replace-dpkg-checkbuilddeps-with-mk-build-deps.patch
++++ b/build/f_repos/patch/fuel-main/0005-replace-dpkg-checkbuilddeps-with-mk-build-deps.patch
 @@ -0,0 +1,38 @@
 +From: Sergii Golovatiuk <sgolovatiuk@mirantis.com>
 +Date: Fri, 3 Jun 2016 12:26:19 +0200
@@ -40,7 +40,7 @@ index 0000000..896f3cf
 +@@ -10,7 +10,7 @@ clean-deb:
 + 	done
 + 	sudo rm -rf $(BUILD_DIR)/packages/deb
-+ 
++
 +-$(BUILD_DIR)/packages/deb/buildd.tar.gz: SANDBOX_DEB_PKGS:=wget bzip2 apt-utils build-essential python-setuptools python-pbr devscripts debhelper fakeroot
 ++$(BUILD_DIR)/packages/deb/buildd.tar.gz: SANDBOX_DEB_PKGS:=wget bzip2 apt-utils build-essential fakeroot devscripts equivs debhelper python-setuptools python-pbr
 + $(BUILD_DIR)/packages/deb/buildd.tar.gz: SANDBOX_UBUNTU:=$(BUILD_DIR)/packages/deb/chroot