Browse Source

Deprecate XenServer 6.5 on MOS10

We will depracate support of XenServer 6.5 since MOS10, this patch
is to implement this via:
(1) Add XCP version check in compute_pre_test.py to make sure
the minimal XCP version is 2.1.0
(2) Replace the guest tool to xe-guest-utilities_7.0.0-24_all.deb
(3) Update related documents to only support XS7.0 and XS7.1

Change-Id: I0a0420d158faf18de3534f501dd2a25d818cc9be
Huan Xie 2 years ago
parent
commit
9a2beb2950

+ 1
- 1
doc/source/description.rst View File

@@ -8,7 +8,7 @@ Requirements
8 8
 Requirement               Version/Comment
9 9
 ========================= ============================
10 10
 Fuel                      9.0
11
-XenServer                 6.5+XS65ESP013, 7.0 and 7.1
11
+XenServer                 7.0 and 7.1
12 12
 XenServer plugin for Fuel @PLUGIN_VERSION@
13 13
 ========================= ============================
14 14
 

+ 1
- 1
doc/source/index.rst View File

@@ -15,7 +15,7 @@ can also be downloaded directly from `citrix.com
15 15
 Citrix account.
16 16
 
17 17
 Documentation for XenServer can be found on `docs.vmd.citrix.com
18
-<http://docs.vmd.citrix.com/XenServer/6.5.0/1.0/en_gb/>`_ and for how
18
+<http://docs.citrix.com/en-us/xenserver/xenserver-7-0.html>`_ and for how
19 19
 XenServer works within OpenStack at docs.openstack.org in the
20 20
 `OpenStack Configuration Reference
21 21
 <http://docs.openstack.org/juno/config-reference/content/introduction-to-xen.html>`_

+ 2
- 2
doc/source/test-plan.rst View File

@@ -67,8 +67,8 @@ https://docs.mirantis.com/openstack/fuel/fuel-9.0/mos-planning-guide.html
67 67
 Product compatibility matrix
68 68
 ----------------------------
69 69
 
70
-The plugin is compatible with MOS 9.0 and XenServer versions 6.5 SP1
71
-(with hotfix XS65ESP013), 7.0 and 7.1, with all hotfixes applied.
70
+The plugin is compatible with MOS 9.0 and XenServer versions 7.0
71
+and 7.1, with all hotfixes applied.
72 72
 
73 73
 
74 74
 Prerequirements

+ 3
- 16
plugin_source/deployment_scripts/compute_post_deployment.py View File

@@ -438,12 +438,7 @@ def check_and_setup_ceilometer(himn, username, password):
438 438
     restart_services('ceilometer-polling')
439 439
 
440 440
 
441
-def enable_conntrack_service(himn, username, xcp_version):
442
-    if LooseVersion(xcp_version) < LooseVersion('2.1.0'):
443
-        # Only support conntrack-tools since XS7.0(XCP2.1.0) and above
444
-        LOG.info('No need to enable conntrack-tools with XCP %s' % xcp_version)
445
-        return
446
-
441
+def enable_conntrack_service(himn, username):
447 442
     # use conntrack statistic mode, so change conntrackd.conf
448 443
     if not os.path.exists('/etc/conntrackd/conntrackd.conf.back'):
449 444
         utils.ssh(himn, username,
@@ -463,14 +458,6 @@ def enable_conntrack_service(himn, username, xcp_version):
463 458
     utils.ssh(himn, username, 'service', 'conntrackd', 'restart')
464 459
 
465 460
 
466
-def get_xcp_version(himn, username):
467
-    xcp_ver = utils.ssh(himn, username,
468
-                        ('xe host-param-get uuid=$(xe host-list --minimal) '
469
-                         'param-name=software-version '
470
-                         'param-key=platform_version'))
471
-    return xcp_ver
472
-
473
-
474 461
 if __name__ == '__main__':
475 462
     install_xenapi_sdk()
476 463
     astute = utils.get_astute()
@@ -487,7 +474,7 @@ if __name__ == '__main__':
487 474
 
488 475
         if username and password and endpoints and himn_local:
489 476
             route_to_compute(endpoints, HIMN_IP, himn_local, username)
490
-            xcp_version = get_xcp_version(HIMN_IP, username)
477
+            xcp_version = utils.get_xcp_version(HIMN_IP, username)
491 478
             if install_xapi:
492 479
                 install_suppack(HIMN_IP, username, XS_PLUGIN_ISO, xcp_version)
493 480
             enable_linux_bridge(HIMN_IP, username)
@@ -504,7 +491,7 @@ if __name__ == '__main__':
504 491
             install_logrotate_script(HIMN_IP, username)
505 492
 
506 493
             # enable conntrackd service in Dom0
507
-            enable_conntrack_service(HIMN_IP, username, xcp_version)
494
+            enable_conntrack_service(HIMN_IP, username)
508 495
 
509 496
             # neutron-l2-agent in compute node
510 497
             modify_neutron_rootwrap_conf(HIMN_IP, username, password)

+ 8
- 0
plugin_source/deployment_scripts/compute_pre_test.py View File

@@ -1,5 +1,6 @@
1 1
 #!/usr/bin/env python
2 2
 
3
+from distutils.version import LooseVersion
3 4
 import json
4 5
 import os
5 6
 import stat
@@ -8,6 +9,7 @@ from utils import HIMN_IP
8 9
 
9 10
 XS_RSA = '/root/.ssh/xs_rsa'
10 11
 VERSION_HOTFIXES = '@VERSION_HOTFIXES@'
12
+MIN_XCP_VERSION = '2.1.0'
11 13
 
12 14
 utils.setup_logging('compute_pre_test.log')
13 15
 LOG = utils.LOG
@@ -38,6 +40,12 @@ def ssh_copy_id(host, username, password):
38 40
 
39 41
 
40 42
 def check_host_compatibility(himn, username):
43
+    xcp_version = utils.get_xcp_version(himn, username)
44
+    if LooseVersion(xcp_version) < LooseVersion(MIN_XCP_VERSION):
45
+        utils.reportError('Platform version %s should equal or greater than %s'
46
+                          % (xcp_version, MIN_XCP_VERSION))
47
+        return
48
+
41 49
     version_hotfixes = json.loads(VERSION_HOTFIXES)
42 50
 
43 51
     ver = utils.ssh(himn, username,

+ 8
- 0
plugin_source/deployment_scripts/utils.py View File

@@ -302,3 +302,11 @@ def add_cron_job(user, job_entry):
302 302
     execute(crontab_cmd, '-u', user, temp_path)
303 303
     os.close(temp_fd)
304 304
     os.remove(temp_path)
305
+
306
+
307
+def get_xcp_version(himn, username):
308
+    xcp_ver = ssh(himn, username,
309
+                  ('xe host-param-get uuid=$(xe host-list --minimal) '
310
+                   'param-name=software-version '
311
+                   'param-key=platform_version'))
312
+    return xcp_ver

BIN
plugin_source/deployment_scripts/xe-guest-utilities_6.5.0-1393_amd64.deb View File


BIN
plugin_source/deployment_scripts/xe-guest-utilities_7.0.0-24_all.deb View File


+ 1
- 1
plugin_source/deployment_tasks.yaml View File

@@ -5,7 +5,7 @@
5 5
   requires: ['network_configuration_end']
6 6
   type: shell
7 7
   parameters:
8
-    cmd: 'dpkg -i ./xe-guest-utilities_6.5.0-1393_amd64.deb'
8
+    cmd: 'dpkg -i ./xe-guest-utilities_7.0.0-24_all.deb'
9 9
     timeout: 60
10 10
 - id: 'compute-pre-test'
11 11
   version: 2.0.0

Loading…
Cancel
Save