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-16 11:33:43 +0200 |
commit | 543bf41c9bba0e217d0b6c1e94aea67a2528bb5e (patch) | |
tree | edb8be0925cde48c95627c26c29d879bc84a8ede /fuel/deploy/install_fuel_master.py | |
parent | 49aacd62348d7edf91c5b9bbd40d31708610e1e5 (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/install_fuel_master.py')
-rw-r--r-- | fuel/deploy/install_fuel_master.py | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/fuel/deploy/install_fuel_master.py b/fuel/deploy/install_fuel_master.py index da313b0..9a2599c 100644 --- a/fuel/deploy/install_fuel_master.py +++ b/fuel/deploy/install_fuel_master.py @@ -125,12 +125,9 @@ class InstallFuelMaster(object): return fuel_menu_pid def get_fuel_menu_pid(self, printout, search): - fuel_menu_pid = None for line in printout.splitlines(): - if search in line: - fuel_menu_pid = clean(line)[1] - break - return fuel_menu_pid + if line.endswith(search): + return clean(line)[1] def ssh_exec_cmd(self, cmd, check=True): with self.ssh: @@ -186,3 +183,23 @@ class InstallFuelMaster(object): log('Delete deprecated fuel client config %s' % FUEL_CLIENT_CONFIG) with self.ssh as s: s.exec_cmd('rm %s' % FUEL_CLIENT_CONFIG, False) + + + + + + + + + + + + + + + + + + + + |