diff options
| author |   Stefan Berg <stefan.k.berg@ericsson.com> | 2016-05-09 11:39:13 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-05-09 11:39:13 +0000 |
| commit | d45fec5d38ec41f1f4babc9d54723437072693f8 (patch) | |
| tree | f215c53a4461a8e08a5d7ae062f598541f992ff8 | |
| parent | 54e25063595435b7b3c5c2e093f42cbff7b21dc7 (diff) | |
| parent | 105b4bb28e91bcce95b695c2e842fc44a05756ef (diff) | |
Merge "Fix handling of relative ISO path on the CLI"
| -rwxr-xr-x | deploy/deploy.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/deploy/deploy.py b/deploy/deploy.py index f86f2be12..0d406412c 100755 --- a/deploy/deploy.py +++ b/deploy/deploy.py @@ -335,9 +335,10 @@ def parse_arguments(): check_file_exists(args.dea_file) check_fuel_plugins_dir(args.fuel_plugins_dir) + iso_abs_path = os.path.abspath(args.iso_file) if not args.no_fuel and not args.cleanup_only: - log('Using OPNFV ISO file: %s' % args.iso_file) - check_file_exists(args.iso_file) + log('Using OPNFV ISO file: %s' % iso_abs_path) + 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) @@ -346,7 +347,7 @@ def parse_arguments(): 'no_health_check': args.no_health_check, 'cleanup_only': args.cleanup_only, 'cleanup': args.cleanup, 'storage_dir': args.storage_dir, 'pxe_bridge': args.pxe_bridge, - 'iso_file': args.iso_file, 'dea_file': args.dea_file, + 'iso_file': iso_abs_path, 'dea_file': args.dea_file, 'dha_file': args.dha_file, 'fuel_plugins_dir': args.fuel_plugins_dir, 'fuel_plugins_conf_dir': args.fuel_plugins_conf_dir, |