Rebase: deploy related patch series.

After change "common.py: catch stderr in exec_cmd" [1] and other
unrelated changes were merged upstream,
we need to rebase the complete deploy related series.

While we're at it, re-export Fuel@OPNFV patches in Armband.

[1] https://gerrit.opnfv.org/gerrit/#/c/14561/

Change-Id: Icbc8261c2e24e4b29e8f5f2bc83db6829219129a

1 files changed, 0 insertions, 48 deletions

diff --git a/patches/opnfv-fuel/0005-bootstrap-Use-public-Ubuntu-ports-mirrors.patch b/patches/opnfv-fuel/0005-bootstrap-Use-public-Ubuntu-ports-mirrors.patch
deleted file mode 100644
index 2300153b..00000000
--- a/patches/opnfv-fuel/0005-bootstrap-Use-public-Ubuntu-ports-mirrors.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Thu, 3 Mar 2016 19:18:27 +0100
-Subject: [PATCH] bootstrap: Use public Ubuntu-ports mirrors.
-
-Instead of relying on 127.0.0.1 partial Ubuntu mirror, use
-public archives.
-While doing so, switch to Ubuntu-ports, enabling  building arm64
-bootstraps.
-
-NOTE: This disables the abillity to build amd64 bootstraps with
-current config.
----
- build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml | 7 ++++---
- 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
---- a/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml
-+++ b/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml
-@@ -36,19 +36,19 @@
-   repos:
-     - name: ubuntu
-       section: "main universe multiverse"
--      uri: "http://127.0.0.1:8080/mirrors/ubuntu"
-+      uri: "http://ports.ubuntu.com/ubuntu-ports"
-       priority:
-       suite: trusty
-       type: deb
-     - name: ubuntu-updates
-       section: "main universe multiverse"
--      uri: "http://127.0.0.1:8080/mirrors/ubuntu"
-+      uri: "http://ports.ubuntu.com/ubuntu-ports"
-       priority:
-       suite: trusty-updates
-       type: deb
-     - name: ubuntu-security
-       section: "main universe multiverse"
--      uri: "http://127.0.0.1:8080/mirrors/ubuntu"
-+      uri: "http://ports.ubuntu.com/ubuntu-ports"
-       priority:
-       suite: trusty-security
-       type: deb
-@@ -60,4 +60,5 @@
-       type: deb
-   skip_default_img_build: true
-   direct_repo_addresses:
-+    - "ports.ubuntu.com"
-     - "127.0.0.1"