summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Ball <bob.ball@citrix.com>2016-08-04 08:10:25 +0000
committerBob Ball <bob.ball@citrix.com>2016-08-04 08:10:25 +0000
commitaccaccc1d68619f33e40393f70a8e89ad94a5a37 (patch)
tree20bda8bc541cdfdcb0ae6ffbd5156cae50139eae
parent260dbab0bde1498263bc924cf6eee96bdd24bbca (diff)
Revert "Use platform version to determine compatibility"
Notes
Notes (review): Code-Review+2: Bob Ball <bob.ball@citrix.com> Workflow+1: Bob Ball <bob.ball@citrix.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Thu, 04 Aug 2016 08:11:44 +0000 Reviewed-on: https://review.openstack.org/351053 Project: openstack/fuel-plugin-xenserver Branch: refs/heads/8.0
-rwxr-xr-xdeployment_scripts/compute_post_deployment.py8
-rwxr-xr-xdeployment_scripts/fuelplugin-utils/build-xenserver-suppack.sh10
-rw-r--r--deployment_scripts/xenserverplugins-liberty.isobin428032 -> 428032 bytes
-rw-r--r--metadata.yaml2
4 files changed, 10 insertions, 10 deletions
diff --git a/deployment_scripts/compute_post_deployment.py b/deployment_scripts/compute_post_deployment.py
index 3a4603f..00c84e1 100755
--- a/deployment_scripts/compute_post_deployment.py
+++ b/deployment_scripts/compute_post_deployment.py
@@ -214,9 +214,9 @@ def check_host_compatibility(himn, username):
214 'xe patch-list name-label=%s --minimal' % hotfix) 214 'xe patch-list name-label=%s --minimal' % hotfix)
215 ver = ssh(himn, username, 215 ver = ssh(himn, username,
216 ('xe host-param-get uuid=$(xe host-list --minimal) ' 216 ('xe host-param-get uuid=$(xe host-list --minimal) '
217 'param-name=software-version param-key=platform_version')) 217 'param-name=software-version param-key=product_version_text'))
218 218
219 if not installed and ver[:3] == "1.8": 219 if not installed and ver == "6.5":
220 reportError(('Hotfix %s has not been installed ' 220 reportError(('Hotfix %s has not been installed '
221 'and product version is %s') % (hotfix, ver)) 221 'and product version is %s') % (hotfix, ver))
222 222
@@ -462,8 +462,8 @@ def patch_neutron_ovs_agent():
462def apply_sm_patch(himn, username): 462def apply_sm_patch(himn, username):
463 ver = ssh(himn, username, 463 ver = ssh(himn, username,
464 ('xe host-param-get uuid=$(xe host-list --minimal) ' 464 ('xe host-param-get uuid=$(xe host-list --minimal) '
465 'param-name=software-version param-key=platform_version')) 465 'param-name=software-version param-key=product_version_text'))
466 if ver[:3] == "1.8": 466 if ver == "6.5":
467 ssh(himn, username, 467 ssh(himn, username,
468 "sed -i s/\\'phy\\'/\\'aio\\'/g /opt/xensource/sm/ISCSISR.py") 468 "sed -i s/\\'phy\\'/\\'aio\\'/g /opt/xensource/sm/ISCSISR.py")
469 469
diff --git a/deployment_scripts/fuelplugin-utils/build-xenserver-suppack.sh b/deployment_scripts/fuelplugin-utils/build-xenserver-suppack.sh
index ffad0e2..623399a 100755
--- a/deployment_scripts/fuelplugin-utils/build-xenserver-suppack.sh
+++ b/deployment_scripts/fuelplugin-utils/build-xenserver-suppack.sh
@@ -27,7 +27,7 @@ mkdir -p xenserver-suppack && cd xenserver-suppack
27# Configurable items 27# Configurable items
28 28
29# xenserver version info 29# xenserver version info
30PLATFORM_VERSION=${1:-"1.8"} 30XS_VERSION=${1:-"6.5"}
31XS_BUILD=${2:-"90233c"} 31XS_BUILD=${2:-"90233c"}
32 32
33# branch info 33# branch info
@@ -117,13 +117,13 @@ parser.add_option('--bld', dest="build")
117parser.add_option('--out', dest="outdir") 117parser.add_option('--out', dest="outdir")
118(options, args) = parser.parse_args() 118(options, args) = parser.parse_args()
119 119
120xcp = Requires(originator='xcp', name='main', test='ge', 120xs = Requires(originator='xs', name='main', test='ge',
121 product='XenServer', version='$PLATFORM_VERSION', 121 product='XenServer', version='$XS_VERSION',
122 build='$XS_BUILD') 122 build='$XS_BUILD')
123 123
124setup(originator='xcp', name='xenserverplugins-$OS_RELEASE', product='XenServer', 124setup(originator='xs', name='xenserverplugins-$OS_RELEASE', product='XenServer',
125 version=options.product_version, build=options.build, vendor='Citrix Systems, Inc.', 125 version=options.product_version, build=options.build, vendor='Citrix Systems, Inc.',
126 description="OpenStack XenServer Plugins", packages=args, requires=[xcp], 126 description="OpenStack XenServer Plugins", packages=args, requires=[xs],
127 outdir=options.outdir, output=['iso']) 127 outdir=options.outdir, output=['iso'])
128EOF 128EOF
129 129
diff --git a/deployment_scripts/xenserverplugins-liberty.iso b/deployment_scripts/xenserverplugins-liberty.iso
index 651ef80..a5586fb 100644
--- a/deployment_scripts/xenserverplugins-liberty.iso
+++ b/deployment_scripts/xenserverplugins-liberty.iso
Binary files differ
diff --git a/metadata.yaml b/metadata.yaml
index 6bc6c27..9564ca9 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -3,7 +3,7 @@ name: fuel-plugin-xenserver
3# Human-readable name for your plugin 3# Human-readable name for your plugin
4title: XenServer Plugin 4title: XenServer Plugin
5# Plugin version 5# Plugin version
6version: '3.90.4' 6version: '3.90.3'
7# Description 7# Description
8description: Enable Mirantis OpenStack to integrate with Xenserver 8description: Enable Mirantis OpenStack to integrate with Xenserver
9# Required fuel version 9# Required fuel version