X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=fuel%2Fdeploy%2Finstall_fuel_master.py;h=0e3c1c044bc402f9469203a3dcbc43839b5adb00;hb=563547b4a9f44090f32c0e17d040114854563760;hp=7ace713d6b7999bdeaa58011906214264bf6a40a;hpb=279fb82409ad6cd18f1ab59ea3db8592d05b3095;p=genesis.git

diff --git a/fuel/deploy/install_fuel_master.py b/fuel/deploy/install_fuel_master.py
index 7ace713..0e3c1c0 100644
--- a/fuel/deploy/install_fuel_master.py
+++ b/fuel/deploy/install_fuel_master.py
@@ -24,6 +24,7 @@ TRANSPLANT_FUEL_SETTINGS = 'transplant_fuel_settings.py'
 BOOTSTRAP_ADMIN = '/usr/local/sbin/bootstrap_admin_node'
 FUEL_CLIENT_CONFIG = '/etc/fuel/client/config.yaml'
 PLUGINS_DIR = '~/plugins'
+LOCAL_PLUGIN_FOLDER = '/opt/opnfv'
 
 
 class InstallFuelMaster(object):
@@ -91,7 +92,7 @@ class InstallFuelMaster(object):
 
         self.delete_deprecated_fuel_client_config_from_fuel_6_1()
 
-        self.upload_plugin_files()
+        self.collect_plugin_files()
 
         self.install_plugins()
 
@@ -99,12 +100,15 @@ class InstallFuelMaster(object):
 
         log('Fuel Master installed successfully !')
 
-    def upload_plugin_files(self):
+    def collect_plugin_files(self):
         with self.ssh as s:
             s.exec_cmd('mkdir %s' % PLUGINS_DIR)
             if self.fuel_plugins_dir:
                 for f in glob.glob('%s/*.rpm' % self.fuel_plugins_dir):
                     s.scp_put(f, PLUGINS_DIR)
+            else:
+                s.exec_cmd('cp %s/*.rpm %s' % (LOCAL_PLUGIN_FOLDER,
+                                               PLUGINS_DIR))
 
     def install_plugins(self):
         log('Installing Fuel Plugins')
@@ -114,7 +118,8 @@ class InstallFuelMaster(object):
                 log('Found plugin %s, installing ...' % f)
                 r, e = s.exec_cmd('fuel plugins --install %s' % f, False)
                 if e and 'does not update installed package' not in r:
-                    raise('Installation of Fuel Plugin %s failed' % f)
+                    raise Exception('Installation of Fuel Plugin %s '
+                                    'failed: %s' % (f, e))
 
     def wait_for_node_up(self):
         WAIT_LOOP = 60
@@ -133,7 +138,7 @@ class InstallFuelMaster(object):
                 self.ssh.close()
 
         if not success:
-            raise('Could not SSH into Fuel VM %s' % self.fuel_ip)
+            raise Exception('Could not SSH into Fuel VM %s' % self.fuel_ip)
 
     def wait_until_fuel_menu_up(self):
         WAIT_LOOP = 60
@@ -150,7 +155,7 @@ class InstallFuelMaster(object):
                 else:
                     break
         if not fuel_menu_pid:
-            raise('Could not find the Fuel Menu Process ID')
+            raise Exception('Could not find the Fuel Menu Process ID')
         return fuel_menu_pid
 
     def get_fuel_menu_pid(self, printout, search):
@@ -193,7 +198,7 @@ class InstallFuelMaster(object):
                     time.sleep(SLEEP_TIME)
 
         if not install_completed:
-            raise('Fuel installation did not complete')
+            raise Exception('Fuel installation did not complete')
 
     def post_install_cleanup(self):
         log('Eject ISO file %s' % self.iso_file)