Code Review
/
fuel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Switching to using local package mirror for installation" into stable/brahmaputra
[fuel.git]
/
deploy
/
install_fuel_master.py
diff --git
a/deploy/install_fuel_master.py
b/deploy/install_fuel_master.py
index
e3a7327
..
4f6a052
100644
(file)
--- a/
deploy/install_fuel_master.py
+++ b/
deploy/install_fuel_master.py
@@
-87,7
+87,7
@@
class InstallFuelMaster(object):
log('Found FUEL menu as PID %s, now killing it' % fuel_menu_pid)
self.ssh_exec_cmd('kill %s' % fuel_menu_pid, False)
log('Found FUEL menu as PID %s, now killing it' % fuel_menu_pid)
self.ssh_exec_cmd('kill %s' % fuel_menu_pid, False)
- log('Wait until installation complete')
+ log('Wait until installation
is
complete')
self.wait_until_installation_completed()
log('Waiting for one minute for Fuel to stabilize')
self.wait_until_installation_completed()
log('Waiting for one minute for Fuel to stabilize')
@@
-117,6
+117,7
@@
class InstallFuelMaster(object):
plugin_files = []
with self.ssh as s:
for plugin_location in [PLUGINS_DIR, LOCAL_PLUGIN_FOLDER]:
plugin_files = []
with self.ssh as s:
for plugin_location in [PLUGINS_DIR, LOCAL_PLUGIN_FOLDER]:
+ s.exec_cmd('mkdir -p %s' % plugin_location)
r = s.exec_cmd('find %s -type f -name \'*.rpm\''
% plugin_location)
plugin_files.extend(r.splitlines())
r = s.exec_cmd('find %s -type f -name \'*.rpm\''
% plugin_location)
plugin_files.extend(r.splitlines())
@@
-130,7
+131,7
@@
class InstallFuelMaster(object):
'failed: %s' % (f, e))
def wait_for_node_up(self):
'failed: %s' % (f, e))
def wait_for_node_up(self):
- WAIT_LOOP =
6
0
+ WAIT_LOOP =
24
0
SLEEP_TIME = 10
success = False
for i in range(WAIT_LOOP):
SLEEP_TIME = 10
success = False
for i in range(WAIT_LOOP):