Revert "Use platform version to determine compatibility"

This reverts commit 260dbab0bd.

Change-Id: I46915992825fddb2b3dd0a2b9d46138658d41974
This commit is contained in:
Bob Ball 2016-08-04 08:10:25 +00:00
parent 260dbab0bd
commit accaccc1d6
4 changed files with 10 additions and 10 deletions

View File

@ -214,9 +214,9 @@ def check_host_compatibility(himn, username):
'xe patch-list name-label=%s --minimal' % hotfix)
ver = ssh(himn, username,
('xe host-param-get uuid=$(xe host-list --minimal) '
'param-name=software-version param-key=platform_version'))
'param-name=software-version param-key=product_version_text'))
if not installed and ver[:3] == "1.8":
if not installed and ver == "6.5":
reportError(('Hotfix %s has not been installed '
'and product version is %s') % (hotfix, ver))
@ -462,8 +462,8 @@ def patch_neutron_ovs_agent():
def apply_sm_patch(himn, username):
ver = ssh(himn, username,
('xe host-param-get uuid=$(xe host-list --minimal) '
'param-name=software-version param-key=platform_version'))
if ver[:3] == "1.8":
'param-name=software-version param-key=product_version_text'))
if ver == "6.5":
ssh(himn, username,
"sed -i s/\\'phy\\'/\\'aio\\'/g /opt/xensource/sm/ISCSISR.py")

View File

@ -27,7 +27,7 @@ mkdir -p xenserver-suppack && cd xenserver-suppack
# Configurable items
# xenserver version info
PLATFORM_VERSION=${1:-"1.8"}
XS_VERSION=${1:-"6.5"}
XS_BUILD=${2:-"90233c"}
# branch info
@ -117,13 +117,13 @@ parser.add_option('--bld', dest="build")
parser.add_option('--out', dest="outdir")
(options, args) = parser.parse_args()
xcp = Requires(originator='xcp', name='main', test='ge',
product='XenServer', version='$PLATFORM_VERSION',
xs = Requires(originator='xs', name='main', test='ge',
product='XenServer', version='$XS_VERSION',
build='$XS_BUILD')
setup(originator='xcp', name='xenserverplugins-$OS_RELEASE', product='XenServer',
setup(originator='xs', name='xenserverplugins-$OS_RELEASE', product='XenServer',
version=options.product_version, build=options.build, vendor='Citrix Systems, Inc.',
description="OpenStack XenServer Plugins", packages=args, requires=[xcp],
description="OpenStack XenServer Plugins", packages=args, requires=[xs],
outdir=options.outdir, output=['iso'])
EOF

View File

@ -3,7 +3,7 @@ name: fuel-plugin-xenserver
# Human-readable name for your plugin
title: XenServer Plugin
# Plugin version
version: '3.90.4'
version: '3.90.3'
# Description
description: Enable Mirantis OpenStack to integrate with Xenserver
# Required fuel version