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 "virtual_fuel: initial support for remote libvirt"
[fuel.git]
/
deploy
/
install_fuel_master.py
diff --git
a/deploy/install_fuel_master.py
b/deploy/install_fuel_master.py
index
4f6a052
..
5adccef
100644
(file)
--- a/
deploy/install_fuel_master.py
+++ b/
deploy/install_fuel_master.py
@@
-21,7
+21,7
@@
from common import (
)
TRANSPLANT_FUEL_SETTINGS = 'transplant_fuel_settings.py'
)
TRANSPLANT_FUEL_SETTINGS = 'transplant_fuel_settings.py'
-BOOTSTRAP_ADMIN = '
/usr/local/sbin/
bootstrap_admin_node'
+BOOTSTRAP_ADMIN = 'bootstrap_admin_node'
FUEL_CLIENT_CONFIG = '/etc/fuel/client/config.yaml'
PLUGINS_DIR = '~/plugins'
LOCAL_PLUGIN_FOLDER = '/opt/opnfv'
FUEL_CLIENT_CONFIG = '/etc/fuel/client/config.yaml'
PLUGINS_DIR = '~/plugins'
LOCAL_PLUGIN_FOLDER = '/opt/opnfv'
@@
-54,8
+54,12
@@
class InstallFuelMaster(object):
self.dha.node_power_off(self.fuel_node_id)
self.dha.node_power_off(self.fuel_node_id)
- log('Zero the MBR')
- self.dha.node_zero_mbr(self.fuel_node_id)
+ if os.environ.get('LIBVIRT_DEFAULT_URI'):
+ log('Upload ISO to pool')
+ self.iso_file = self.dha.upload_iso(self.iso_file)
+ else:
+ log('Zero the MBR')
+ self.dha.node_zero_mbr(self.fuel_node_id)
self.dha.node_set_boot_order(self.fuel_node_id, ['disk', 'iso'])
self.dha.node_set_boot_order(self.fuel_node_id, ['disk', 'iso'])