diff options
| author |   Szilard Cserey <szilard.cserey@ericsson.com> | 2015-09-14 11:49:04 +0200 |
|---|---|---|
| committer | Szilard Cserey <szilard.cserey@ericsson.com> | 2015-09-14 16:35:45 +0200 |
| commit | d72aa3b7da9f9e2eb5bd0690be58365027a70f0a (patch) | |
| tree | b72970a7a2c0ec40d2f1deabff4f05975df60c59 /fuel/deploy/deploy.py | |
| parent | 282a53a0d531fb39bd39d5c6673c72f240feb9d7 (diff) | |
FIX for Autodeployer
- Fuel installation - fix for finding fuelmenu
- ugo+rwx access rights to autodeploy.log file
- backward compatibility for argument parsing of ISO, DEA, DHA
Change-Id: Ib4ad5b0868a25b0357cfcd9d8f644bb3a0703b25
Signed-off-by: Szilard Cserey <szilard.cserey@ericsson.com>
Diffstat (limited to 'fuel/deploy/deploy.py')
| -rw-r--r-- | fuel/deploy/deploy.py | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/fuel/deploy/deploy.py b/fuel/deploy/deploy.py index 304db66..1acce42 100644 --- a/fuel/deploy/deploy.py +++ b/fuel/deploy/deploy.py @@ -242,15 +242,26 @@ def parse_arguments(): parser.add_argument('-c', dest='cleanup', action='store_true', default=False, help='Cleanup after deploy') - parser.add_argument('-iso', dest='iso_file', action='store', nargs='?', - default='%s/OPNFV.iso' % CWD, - help='ISO File [default: OPNFV.iso]') - parser.add_argument('-dea', dest='dea_file', action='store', nargs='?', - default='%s/dea.yaml' % CWD, - help='Deployment Environment Adapter: dea.yaml') - parser.add_argument('-dha', dest='dha_file', action='store', nargs='?', - default='%s/dha.yaml' % CWD, - help='Deployment Hardware Adapter: dha.yaml') + if {'-iso', '-dea', '-dha', '-h'}.intersection(sys.argv): + parser.add_argument('-iso', dest='iso_file', action='store', nargs='?', + default='%s/OPNFV.iso' % CWD, + help='ISO File [default: OPNFV.iso]') + parser.add_argument('-dea', dest='dea_file', action='store', nargs='?', + default='%s/dea.yaml' % CWD, + help='Deployment Environment Adapter: dea.yaml') + parser.add_argument('-dha', dest='dha_file', action='store', nargs='?', + default='%s/dha.yaml' % CWD, + help='Deployment Hardware Adapter: dha.yaml') + else: + parser.add_argument('iso_file', action='store', nargs='?', + default='%s/OPNFV.iso' % CWD, + help='ISO File [default: OPNFV.iso]') + parser.add_argument('dea_file', action='store', nargs='?', + default='%s/dea.yaml' % CWD, + help='Deployment Environment Adapter: dea.yaml') + parser.add_argument('dha_file', action='store', nargs='?', + default='%s/dha.yaml' % CWD, + help='Deployment Hardware Adapter: dha.yaml') parser.add_argument('-s', dest='storage_dir', action='store', default='%s/images' % CWD, help='Storage Directory [default: images]') |