Upgrade to MOS 9

This upgrade includes the following changes:

* Rename ml2_conf.ini to openvswitch_agent.ini
* Remove sm patch because XS 6.5 is no longer supported
* Fix multipathd device pattern
* Rename neutron-plugin-openvswitch-agent to
  neutron-openvswitch-agent

Change-Id: Ic8048254949cbd124f65eb469dd2979704c49ddb

branding.inc

@@ -1,5 +1,5 @@
 HYPERVISOR_NAME=XenServer
 HYPERVISOR_LOWER=xenserver
 PLUGIN_NAME=fuel-plugin-xenserver
-PLUGIN_VERSION=3.90
+PLUGIN_VERSION=3.91
-PLUGIN_REVISION=6
+PLUGIN_REVISION=1

doc/source/description.rst

@@ -1,4 +1,4 @@
-XenServer Plugin for Fuel 8.0
+XenServer Plugin for Fuel 9.0
 =============================
 
 Requirements
@@ -7,9 +7,8 @@ Requirements
 ========================= ============================
 Requirement               Version/Comment
 ========================= ============================
-Fuel                      8.0
+Fuel                      9.0
-XenServer                 6.5 SP1 + Hotfix XS65ESP1013
+XenServer                 7.0
-                          7.0
 XenServer plugin for Fuel @PLUGIN_VERSION@
 ========================= ============================
 

doc/source/guide.rst

@@ -18,7 +18,7 @@ Prepare infrastructure
 
    - Other service nodes (e.g. storage node) can also be created as virtual machines, but this is not required
 
-2. Download and install XenServer 6.5 with SP1, Hotfix XS65ESP1013 and HIMN tool, a XenServer plugin, as install guide mentioned. Use it for future VM creation and network configuration.
+2. Download and install XenServer 7.0 and HIMN tool, a XenServer plugin, as install guide mentioned. Use it for future VM creation and network configuration.
 
 3. While many networking setups are expected to work, the following setup is known to work:
 

doc/source/installation.rst

@@ -11,14 +11,14 @@ To install the XenServer Fuel plugin:
 #. Copy the *rpm* file to the Fuel Master node:
    ::
 
-      [root@home ~]# scp fuel-plugin-xenserver-3.1-3.1.2-1.noarch.rpm root@fuel:/tmp
+      [root@home ~]# scp fuel-plugin-xenserver-4.0-4.0.0-1.noarch.rpm root@fuel:/tmp
 
 #. Log into Fuel Master node and install the plugin using the
    `Fuel CLI <http://docs.openstack.org/developer/fuel-docs/userdocs/fuel-user-guide/cli.html>`_:
 
    ::
 
-      [root@fuel-master ~]# fuel plugins --install /tmp/fuel-plugin-xenserver-3.1-3.1.2-1.noarch.rpm
+      [root@fuel-master ~]# fuel plugins --install /tmp/fuel-plugin-xenserver-4.0-4.0.0-1.noarch.rpm
 
 #. Verify that the plugin is installed correctly:
    ::
@@ -26,7 +26,7 @@ To install the XenServer Fuel plugin:
      [root@fuel-master ~]# fuel plugins
      id | name                  | version | package_version
      ---|-----------------------|---------|----------------
-     1  | fuel-plugin-xenserver | 3.1.2   | 4.0.0
+     1  | fuel-plugin-xenserver | 4.0.0   | 4.0.0
 
 Add Management Network tool
 ---------------------------

doc/source/relnotes.rst

@@ -1,6 +1,11 @@
 Release Notes
 =============
 
+Version 4.0.0
+-------------
+
+* Works with Fuel 9.0
+
 Version 3.1.2
 -------------
 

doc/source/test-plan.rst

@@ -62,7 +62,7 @@ be used by Neutron for VM traffic.
       :width: 80%
 
 For the hardware configuration see Mirantis OpenStack Planning Guide at
-https://docs.mirantis.com/openstack/fuel/fuel-8.0/mos-planning-guide.html
+https://docs.mirantis.com/openstack/fuel/fuel-9.0/mos-planning-guide.html
 
 Product compatibility matrix
 ----------------------------
@@ -121,15 +121,15 @@ Install XenServer Fuel Plugin
        and the new OpenStack release is registered.
    * - Steps
      -
-       | ``fuel plugins --install /tmp/fuel-plugin-xenserver-3.1-3.1.2-1.noarch.rpm``
+       | ``fuel plugins --install /tmp/fuel-plugin-xenserver-4.0-4.0.0-1.noarch.rpm``
        | ``fuel plugins``
        | ``id | name                  | version | package_version``
-       | ``1  | fuel-plugin-xenserver | 3.1.2   | 4.0.0``
+       | ``1  | fuel-plugin-xenserver | 4.0.0   | 4.0.0``
    * - Expected Result
      -
        | ``fuel plugins``
        | ``id | name                  | version | package_version``
-       | ``1  | fuel-plugin-xenserver | 3.1.2   | 4.0.0``
+       | ``1  | fuel-plugin-xenserver | 4.0.0   | 4.0.0``
 
 Prepare Nodes
 -------------
@@ -412,7 +412,7 @@ Uninstall of plugin with deployed environment
      - Verify XenServer Fuel Plugin cannot be uninstalled before all
        dependant environments are removed.
    * - Steps
-     - ``fuel plugins --remove fuel-plugin-xenserver==3.1.2``
+     - ``fuel plugins --remove fuel-plugin-xenserver==4.0.0``
    * - Expected Result
      - 400 Client Error: Bad Request (Can't delete plugin which is enabled
        for some environment.)
@@ -431,7 +431,7 @@ Uninstall of plugin
      - Verify XenServer Fuel Plugin can be uninstalled as well as XenServer
        OpenStack release after all dependant environments are removed.
    * - Steps
-     - | ``fuel plugins --remove fuel-plugin-xenserver==3.1.2``
+     - | ``fuel plugins --remove fuel-plugin-xenserver==4.0.0``
        | ``fuel plugins``
    * - Expected Result
      - Plugin is removed.
@@ -468,4 +468,8 @@ Revision history
    * - 3.1
      - 22.03.2016
      - John Hua (john.hua@citrix.com)
-     - Revised for plugin 3.1.2
+     - Revised for plugin 4.0.0
+   * - 4.0
+     - 12.08.2016
+     - John Hua (john.hua@citrix.com)
+     - Revised for Fuel 9.0

doc/source/test-report.rst

@@ -30,16 +30,16 @@ Revision history
      - 19.04.2016
      - John Hua(john.hua@citrix.com)
      - Rewrite in RST
-   * - 3.2
+   * - 4.0
-     - 12.05.2016
+     - 12.08.2016
      - John Hua(john.hua@citrix.com)
-     - Revised for plugin 3.1.2
+     - Revised for Mirantis Fuel 9.0
 
 Document purpose
 ================
 
 This document provides test run results for the XenServer Fuel Plugin version
-3.1.2 on Mirantis OpenStack 8.0.
+4.0.0 on Mirantis OpenStack 9.0.
 
 Test environment
 ================

doc/source/troubleshooting.rst

@@ -13,9 +13,8 @@ Troubleshooting
    they are requested. `Writing Good Bug Reports for XenServer`_ might be a
    good reference to follow.
 
-#. XenServer hotfixes
+#. XenServer version
 
-   If you are using XenServer 6.5, please install SP1 and all hotfixes before
+   Please use XenServer 7.0. XenServer 6.5 is no longer supported in MOS 9.
-   attempting to deploy.
 
 .. _Writing Good Bug Reports for XenServer: https://www.citrix.com/blogs/2012/07/16/writing-good-bug-reports-for-xenserver/

plugin_source/deployment_scripts/compute_post_deployment.py

@@ -386,7 +386,7 @@ def modify_neutron_rootwrap_conf(himn, username, password):
 
 
 def modify_neutron_ovs_agent_conf(int_br, br_mappings):
-    filename = '/etc/neutron/plugins/ml2/ml2_conf.ini'
+    filename = '/etc/neutron/plugins/ml2/openvswitch_agent.ini'
     cf = ConfigParser.ConfigParser()
     try:
         cf.read(filename)
@@ -475,13 +475,13 @@ def patch_neutron_ovs_agent():
     pass
 
 
-def apply_sm_patch(himn, username):
+def reconfig_multipath():
-    ver = ssh(himn, username,
+    """
-              ('xe host-param-get uuid=$(xe host-list --minimal) '
+    Ignore local disks for multipathd by changing devnode rule from
-               'param-name=software-version param-key=platform_version'))
+    "^hd[a-z]" to "^(hd|xvd)[a-z]"
-    if ver[:3] == PLATFORM_VERSION:
+    """
-        ssh(himn, username,
+    execute('sed', '-i', r's/"\^hd\[a-z\]"/"^(hd|xvd)[a-z]"/', '/etc/multipath.conf')
-            "sed -i s/\\'phy\\'/\\'aio\\'/g /opt/xensource/sm/ISCSISR.py")
+    execute('service', 'multipath-tools', 'restart')
 
 
 if __name__ == '__main__':
@@ -511,9 +511,6 @@ if __name__ == '__main__':
             # port forwarding for novnc
             forward_port('br-mgmt', himn_eth, HIMN_IP, '80')
 
-            # apply sm patch
-            apply_sm_patch(HIMN_IP, username)
-
             create_novacompute_conf(HIMN_IP, username, password, public_ip, services_ssl)
             patch_compute_xenapi()
             restart_services('nova-compute')
@@ -525,4 +522,6 @@ if __name__ == '__main__':
             br_mappings = find_bridge_mappings(astute, HIMN_IP, username)
             modify_neutron_ovs_agent_conf(INT_BRIDGE, br_mappings)
             patch_neutron_ovs_agent()
-            restart_services('neutron-plugin-openvswitch-agent')
+            restart_services('neutron-openvswitch-agent')
+
+            reconfig_multipath()

plugin_source/metadata.yaml

@@ -7,7 +7,7 @@ version: '@PLUGIN_VERSION@.@PLUGIN_REVISION@'
 # Description
 description: Enable Mirantis OpenStack to integrate with @HYPERVISOR_NAME@
 # Required fuel version
-fuel_version: ['8.0']
+fuel_version: ['9.0']
 # Specify license of your plugin
 licenses: ['Apache License Version 2.0']
 # Specify author or company name
@@ -24,7 +24,7 @@ is_hotpluggable: false
 # The plugin is compatible with releases in the list
 releases:
   - os: ubuntu
-    version: 'liberty-8.0'
+    version: 'mitaka-9.0'
     mode: ['multinode', 'ha']
     deployment_scripts_path: deployment_scripts/
     repository_path: repositories/ubuntu