summaryrefslogtreecommitdiffstats
path: root/deploy/deploy.py
diff options
context:
space:
mode:
authorMichal Skalski <mskalski@mirantis.com>2016-07-08 16:14:15 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-07-08 16:14:15 +0000
commit7c600840185d9b454c1995e35a9704db823fb5c6 (patch)
tree0ec5e3307add52ae90b08f60f7970d7b33341d5f /deploy/deploy.py
parentf59b4e0786f11e2799990beeaf0e4a148c3572af (diff)
parentdfc83244874060c4052bc3d29c256fa1bd52687d (diff)
Merge changes from topic 'multiple-nics-for-fuel-vm'
* changes: deploy: add support for multiple bridges virtual_fuel: prepare class to allow multiple bridges
Diffstat (limited to 'deploy/deploy.py')
-rwxr-xr-xdeploy/deploy.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/deploy/deploy.py b/deploy/deploy.py
index 8064af993..56e5bd583 100755
--- a/deploy/deploy.py
+++ b/deploy/deploy.py
@@ -318,8 +318,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',
@@ -341,6 +341,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)
check_dir_exists(os.path.dirname(args.deploy_log))
@@ -355,7 +358,8 @@ def parse_arguments():
check_file_exists(iso_abs_path)
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,