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, 47 deletions

diff --git a/patches/opnfv-fuel/0029-UX-Update-bootstrap-target-build-time-estimate.patch b/patches/opnfv-fuel/0029-UX-Update-bootstrap-target-build-time-estimate.patch
deleted file mode 100644
index 4eefbc1d..00000000
--- a/patches/opnfv-fuel/0029-UX-Update-bootstrap-target-build-time-estimate.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Mon, 9 May 2016 17:05:53 +0200
-Subject: [PATCH] UX: Update bootstrap/target build time estimate.
-
-While building for a different architecture (e.g. AArch64 on x86_64),
-the bootstrap/target image build may take longer, due to latency
-introduced by using qemu-user-static.
-
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- build/f_isoroot/f_bootstrap/bootstrap_admin_node.sh | 9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/build/bootstrap_admin_node.sh.patch b/build/bootstrap_admin_node.sh.patch
-index c66b497..46b53e6 100644
---- a/build/bootstrap_admin_node.sh.patch
-+++ b/build/bootstrap_admin_node.sh.patch
-@@ -1,6 +1,29 @@
- *** bootstrap_admin_node.sh.orig	Mon May 30 06:31:38 2016
- --- bootstrap_admin_node.sh	Mon May 30 06:35:11 2016
- ***************
-+*** 86,94 ****
-+  http://docs.openstack.org/developer/fuel-docs/userdocs/fuel-install-guide/bootstrap/\
-+  bootstrap_troubleshoot.html"
-+  bs_progress_message="There is no active bootstrap. Bootstrap image building \
-+! is in progress. Usually it takes 15-20 minutes. It depends on your internet \
-+! connection and hardware performance. After bootstrap image becomes available, \
-+! reboot nodes that failed to be discovered."
-+  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"
-+--- 86,96 ----
-+  http://docs.openstack.org/developer/fuel-docs/userdocs/fuel-install-guide/bootstrap/\
-+  bootstrap_troubleshoot.html"
-+  bs_progress_message="There is no active bootstrap. Bootstrap image building \
-+! is in progress. Usually it takes 15-20 minutes for a native build (x86_64) \
-+! and/or 30-45 minutes for each cross-build (e.g. AArch64). \
-+! It depends on your internet connection, hardware performance and selected \
-+! bootstrap architecture(s). This ISO supports AArch64 only. After bootstrap \
-+! image becomes available, reboot nodes that failed to be discovered."
-+  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"
-+***************
- *** 339,346 ****
-   set +x
-   echo "Done!"