X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=genesis.git;a=blobdiff_plain;f=fuel%2Fdeploy%2Finstall_fuel_master.py;fp=fuel%2Fdeploy%2Finstall_fuel_master.py;h=0e3c1c044bc402f9469203a3dcbc43839b5adb00;hp=acacf379d07cce13015a0f2ffa227e039df0bc74;hb=44c725b93a6f8e88f5892b2376f341fd24bd027c;hpb=c2b7eda785ab1b3e6b728c8dba1ae87dc252802f diff --git a/fuel/deploy/install_fuel_master.py b/fuel/deploy/install_fuel_master.py index acacf37..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')