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

diff --git a/patches/opnfv-fuel/0023-deploy.py-add-multiple-bridges-support.patch b/patches/opnfv-fuel/0023-deploy.py-add-multiple-bridges-support.patch
deleted file mode 100644
index 37a888b4..00000000
--- a/patches/opnfv-fuel/0023-deploy.py-add-multiple-bridges-support.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From: Josep Puigdemont <josep.puigdemont@enea.com>
-Date: Fri, 6 May 2016 04:32:06 +0200
-Subject: [PATCH] deploy.py: add multiple bridges support
-
-Some Fuel VMs may need more than one network interface. To be able to do
-that, we now allow the user to specify the "-b" paramter (bridge)
-multiple times, creating a new NIC for each one of them.
-
-The NICs are created in the same order as they are given in the command
-line.
-
-There is no change in behavior from earlier versions, pxebr will still
-be the default bridge if none is specified.
-
-Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
----
- deploy/deploy.py                    | 10 +++++++---
- deploy/environments/virtual_fuel.py |  3 ++-
- 2 files changed, 9 insertions(+), 4 deletions(-)
-
-diff --git a/deploy/deploy.py b/deploy/deploy.py
-index ff4582a..041ba2f 100755
---- a/deploy/deploy.py
-+++ b/deploy/deploy.py
-@@ -312,8 +312,8 @@ def parse_arguments():
-     parser.add_argument('-s', dest='storage_dir', action='store',
-                         default='%s/images' % CWD,
-                         help='Storage Directory [default: images]')
--    parser.add_argument('-b', dest='pxe_bridge', action='store',
--                        default='pxebr',
-+    parser.add_argument('-b', dest='pxe_bridge', action='append',
-+                        default=[],
-                         help='Linux Bridge for booting up the Fuel Master VM '
-                              '[default: pxebr]')
-     parser.add_argument('-p', dest='fuel_plugins_dir', action='store',
-@@ -332,6 +332,9 @@ def parse_arguments():
-     args = parser.parse_args()
-     log(args)
- 
-+    if not args.pxe_bridge:
-+        args.pxe_bridge = ['pxebr']
-+
-     check_file_exists(args.dha_file)
- 
-     if not args.cleanup_only:
-@@ -343,6 +346,7 @@ def parse_arguments():
-         log('Using image directory: %s' % args.storage_dir)
-         create_dir_if_not_exists(args.storage_dir)
--        check_bridge(args.pxe_bridge, args.dha_file)
-+        for bridge in args.pxe_bridge:
-+            check_bridge(bridge, args.dha_file)
- 
-     kwargs = {'no_fuel': args.no_fuel, 'fuel_only': args.fuel_only,
-               'no_health_check': args.no_health_check,
-diff --git a/deploy/environments/virtual_fuel.py b/deploy/environments/virtual_fuel.py
-index b68577e..6b673d0 100644
---- a/deploy/environments/virtual_fuel.py
-+++ b/deploy/environments/virtual_fuel.py
-@@ -121,7 +121,8 @@ class VirtualFuel(ExecutionEnvironment):
-         disk_path = self.create_image(disk_path, disk_size)
- 
-         self.del_vm_nics()
--        self.add_vm_nic(self.pxe_bridge)
-+        for bridge in self.pxe_bridge:
-+            self.add_vm_nic(bridge)
-         self.update_vm_template_file()
- 
-         vm_definition_overwrite = self.dha.get_vm_definition('fuel')