Refix suppack builder and platform version

Apart from the readme need to be updated, the platform version also
need to be corrected. And as xenserver-nova-suppack-builder is modified,
a earlier branch of the repo needs to be specified.

Change-Id: Id858f5c1a58cc359739cb23e4e954ba86a93c7bb

deployment_scripts/compute_post_deployment.py

@@ -22,6 +22,7 @@ HIMN_IP = '169.254.0.1'
 INT_BRIDGE = 'br-int'
 XS_PLUGIN_ISO = 'xenserverplugins-liberty.iso'
 DIST_PACKAGES_DIR = '/usr/lib/python2.7/dist-packages/'
+PLATFORM_VERSION = '1.9'
 
 if not os.path.exists(LOG_ROOT):
     os.mkdir(LOG_ROOT)
@@ -216,7 +217,7 @@ def check_host_compatibility(himn, username):
               ('xe host-param-get uuid=$(xe host-list --minimal) '
                'param-name=software-version param-key=platform_version'))
 
-    if not installed and ver[:3] == "1.8":
+    if not installed and ver[:3] == PLATFORM_VERSION:
         reportError(('Hotfix %s has not been installed '
                      'and product version is %s') % (hotfix, ver))
 
@@ -463,7 +464,7 @@ 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":
+    if ver[:3] == PLATFORM_VERSION:
         ssh(himn, username,
             "sed -i s/\\'phy\\'/\\'aio\\'/g /opt/xensource/sm/ISCSISR.py")
 

deployment_scripts/fuelplugin-utils/README.md

@@ -8,9 +8,9 @@ and then make them in one ISO.
 
 ## usage:
 
-#####./build-xenserver-suppack.sh $xs-version $xs-build $os-git-branch $os-plugin-version
+#####./build-xenserver-suppack.sh $xcp-version $xs-build $os-git-branch $os-plugin-version
 
-* xs-version: XenServer version which can be used for this plugin
+* xcp-version: Xen cloud platform version which can be used for this plugin
 
 * xs-build: XenServer build number
 
@@ -22,7 +22,7 @@ and then make them in one ISO.
 
 *NOTE: If no input parameters given, default values are used*
 
-*xs-version: 6.5*
+*xcp-version: 1.9.0
 
 *xs-build: 90233c*
 

deployment_scripts/fuelplugin-utils/build-xenserver-suppack.sh

@@ -27,17 +27,17 @@ mkdir -p xenserver-suppack && cd xenserver-suppack
 # Configurable items
 
 # xenserver version info
-PLATFORM_VERSION=${1:-"1.8"}
+PLATFORM_VERSION=${1:-"1.9"}
 XS_BUILD=${2:-"90233c"}
 
 # branch info
-GITBRANCH=${3:-"stable/liberty"}
+GITBRANCH=${3:-"origin/stable/liberty"}
 
 # nova and neutron xenserver dom0 plugin version
 XS_PLUGIN_VERSION=${4:-"2015.1"}
 
 # OpenStack release
-OS_RELEASE=liberty
+OS_RELEASE=${5:-"liberty"}
 
 # repository info
 NOVA_GITREPO="https://git.openstack.org/openstack/nova"
@@ -52,7 +52,10 @@ export DEBIAN_FRONTEND=noninteractive
 # =============================================
 # Check out rpm packaging repo
 rm -rf xenserver-nova-suppack-builder
-git clone $RPM_BUILDER_REPO
+git clone $RPM_BUILDER_REPO xenserver-nova-suppack-builder
+cd xenserver-nova-suppack-builder
+git checkout -b mos_suppack_builder "$GITBRANCH"
+cd ..
 
 
 # =============================================
@@ -60,8 +63,7 @@ git clone $RPM_BUILDER_REPO
 rm -rf nova
 git clone "$NOVA_GITREPO" nova
 cd nova
-git fetch origin "$GITBRANCH"
-git checkout FETCH_HEAD
+git checkout -b mos_nova "$GITBRANCH"
 # patch xenhost as this file is not merged to liberty
 cp $DEPLOYMENT_SCRIPT_ROOT/patchset/xenhost plugins/xenserver/xenapi/etc/xapi.d/plugins/
 cd ..
@@ -78,8 +80,7 @@ RPMFILE=$(find -name "openstack-xen-plugins-*.noarch.rpm" -print)
 rm -rf neutron
 git clone "$NEUTRON_GITREPO" neutron
 cd neutron
-git fetch origin "$GITBRANCH"
-git checkout FETCH_HEAD
+git checkout -b mos_neutron "$GITBRANCH"
 # patch netwrap as this file is not merged to liberty
 cp $DEPLOYMENT_SCRIPT_ROOT/patchset/netwrap \
     neutron/plugins/ml2/drivers/openvswitch/agent/xenapi/etc/xapi.d/plugins/

metadata.yaml

@@ -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.5'
 # Description
 description: Enable Mirantis OpenStack to integrate with Xenserver
 # Required fuel version