X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=fuel%2Fdeploy%2Fdeploy.py;h=178ae76e2242ca3df9f924b13972f1fb56946f18;hb=563547b4a9f44090f32c0e17d040114854563760;hp=304db66fd91a40f9cba2cdbc434df617a1792f68;hpb=c92ee8677af0dba1b9f28bc9a97cbf141d60e219;p=genesis.git

diff --git a/fuel/deploy/deploy.py b/fuel/deploy/deploy.py
index 304db66..178ae76 100644
--- a/fuel/deploy/deploy.py
+++ b/fuel/deploy/deploy.py
@@ -102,7 +102,8 @@ class AutoDeploy(object):
         fuel = InstallFuelMaster(self.dea_file, self.dha_file,
                                  self.fuel_conf['ip'], self.fuel_username,
                                  self.fuel_password, self.fuel_node_id,
-                                 self.iso_file, WORK_DIR)
+                                 self.iso_file, WORK_DIR,
+                                 self.fuel_plugins_dir)
         fuel.install()
 
     def patch_iso(self, new_iso):
@@ -158,8 +159,7 @@ class AutoDeploy(object):
     def deploy_env(self):
         dep = CloudDeploy(self.dea, self.dha, self.fuel_conf['ip'],
                           self.fuel_username, self.fuel_password,
-                          self.dea_file, self.fuel_plugins_dir, WORK_DIR,
-                          self.no_health_check)
+                          self.dea_file, WORK_DIR, self.no_health_check)
         return dep.deploy()
 
     def setup_execution_environment(self):
@@ -219,7 +219,7 @@ def check_fuel_plugins_dir(dir):
     elif not os.listdir(dir):
         msg = 'Fuel Plugins Directory is empty!'
     if msg:
-        warn('%s Opendaylight Fuel Plugin will not be installed!' % msg)
+        warn('%s No external plugins will be installed!' % msg)
 
 
 def parse_arguments():
@@ -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]')