x
/
fuel-plugin-xenserver
Code Issues Proposed changes

Add Dundee support 

To support Dundee as XenServer 7.0 (or RTM as 6.6), below changes
required to be addressed

* blacklist-bridge is renamed
* Production version increases
* Hotfix XS65ESP1013 is no longer needed

Change-Id: Ib154f8d2ff47400889ca8720b35035434c1f1e08
(cherry picked from commit de6fcfc2bc431384c1f1297a6467615239264056)
This commit is contained in:
John Hua 2016-04-19 13:21:42 +08:00 committed by Bob Ball
parent 11398e2bdb
commit 5ac2d61cb1
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
deployment_scripts/compute_post_deployment.py
View File

@ -169,11 +169,17 @@ def init_eth():
reportError('HIMN failed to get IP address from XenServer')
def check_hotfix_exists(himn, username, password, hotfix):
out = ssh(HIMN_IP, username, password,
'xe patch-list name-label=%s' % hotfix)
if not out:
reportError('Hotfix %s has not been installed' % hotfix)
def check_host_compatibility(himn, username, password):
hotfix = 'XS65ESP1013'
installed = ssh(himn, username, password,
'xe patch-list name-label=%s --minimal' % hotfix)
ver = ssh(himn, username, password,
('xe host-param-get uuid=$(xe host-list --minimal) '
'param-name=software-version param-key=product_version_text'))
if not installed and ver == "6.5":
reportError(('Hotfix %s has not been installed '
'and product version is %s') % (hotfix, ver))
def install_xenapi_sdk():
@ -373,7 +379,7 @@ def enable_linux_bridge(himn, username, password):
# When using OVS under XS6.5, it will prevent use of Linux bridge in
# Dom0, but neutron-openvswitch-agent in compute node will use Linux
# bridge, so we remove this restriction here
ssh(himn, username, password, 'rm -f /etc/modprobe.d/blacklist-bridge')
ssh(himn, username, password, 'rm -f /etc/modprobe.d/blacklist-bridge*')
def patch_compute_xenapi():
@ -410,7 +416,7 @@ if __name__ == '__main__':
astute, ('public_ssl', 'services'))
if username and password and endpoints and himn_local:
check_hotfix_exists(HIMN_IP, username, password, 'XS65ESP1013')
check_host_compatibility(HIMN_IP, username, password)
route_to_compute(
endpoints, HIMN_IP, himn_local, username, password)
if install_xapi: