Browse Source

Use XCP as platform name in build supplementak packages

As we will support both XenServer and branded products at the same
time, so when building the supplemenatl packages, using the common
XCP as platform name is better, this fix to to use XCP

Change-Id: Ib8b79608c6cfdb85f3718c7daefaccc120a3e775
Huan Xie 2 years ago
parent
commit
fea2e5d9a5
2 changed files with 7 additions and 10 deletions
  1. 1
    1
      Makefile
  2. 6
    9
      suppack/build-xenserver-suppack.sh

+ 1
- 1
Makefile View File

@@ -26,7 +26,7 @@ REQUIRED_ISOS=$(PLATFORMS:%=suppack/xcp_%/xenapi-plugins-${OPENSTACK_RELEASE}.is
26 26
 iso: $(REQUIRED_ISOS)
27 27
 
28 28
 $(REQUIRED_ISOS): plugin_source/deployment_scripts/patchset/xenhost
29
-	suppack/build-xenserver-suppack.sh ${OPENSTACK_RELEASE} "${HYPERVISOR_NAME}"
29
+	suppack/build-xenserver-suppack.sh ${OPENSTACK_RELEASE}
30 30
 
31 31
 ${BUILDROOT}/${PLUGIN_NAME}/branded: ${BRANDING} ${REQUIRED_ISOS} plugin_source
32 32
 	mkdir -p ${BUILDROOT}/${PLUGIN_NAME}

+ 6
- 9
suppack/build-xenserver-suppack.sh View File

@@ -4,13 +4,12 @@ set -eux
4 4
 
5 5
 # =============================================
6 6
 # Usage of this script:
7
-# ./build-xenserver-suppack.sh os-release hypervisor-name xs-plugin-version key
7
+# ./build-xenserver-suppack.sh os-release xs-plugin-version key
8 8
 # Or
9 9
 # ./build-xenserver-suppack.sh
10 10
 #
11 11
 # You can provide explict input parameters or you can use the default ones:
12 12
 #   OpenStack release
13
-#   Hypervisor name
14 13
 #   XenServer OpenStack plugin version
15 14
 #   Key for building supplemental packages
16 15
 #   Keyfile for building supplemental packages
@@ -46,16 +45,14 @@ mkdir -p $BUILDROOT && cd $BUILDROOT
46 45
 # OpenStack release
47 46
 OS_RELEASE=${1:-"mitaka"}
48 47
 
49
-HYPERVISOR_NAME=${2:-"XenServer"}
50
-
51 48
 # nova and neutron xenserver dom0 plugin version
52
-XS_PLUGIN_VERSION=${3:-"13.0.0"}
49
+XS_PLUGIN_VERSION=${2:-"13.0.0"}
53 50
 
54 51
 # key of the public/secret OpenStack GPG key
55
-SUPPACK_KEY=${4:-"Citrix OpenStack (XenServer Updates) <openstack@citrix.com>"}
52
+SUPPACK_KEY=${3:-"Citrix OpenStack (XenServer Updates) <openstack@citrix.com>"}
56 53
 
57 54
 # keyfile
58
-SUPPACK_KEYFILE=${5:-"RPM-GPG-KEY-XS-OPENSTACK"}
55
+SUPPACK_KEYFILE=${4:-"RPM-GPG-KEY-XS-OPENSTACK"}
59 56
 
60 57
 # branch info
61 58
 GITBRANCH="stable/$OS_RELEASE"
@@ -189,7 +186,7 @@ EOF
189 186
 python buildscript.py \
190 187
 --pdn=xenapi-plugins-$OS_RELEASE \
191 188
 --pdv="1.9.0" \
192
---hvn="$HYPERVISOR_NAME" \
189
+--hvn="XCP" \
193 190
 --desc="OpenStack Plugins" \
194 191
 --bld=0 \
195 192
 --out=$SUPPACK_CREEDENCE \
@@ -199,7 +196,7 @@ $NEUTRON_RPMFILE
199 196
 python buildscript.py \
200 197
 --pdn=xenapi-plugins-$OS_RELEASE \
201 198
 --pdv="2.1.0" \
202
---hvn="$HYPERVISOR_NAME" \
199
+--hvn="XCP" \
203 200
 --desc="OpenStack Plugins" \
204 201
 --bld=0 \
205 202
 --out=$SUPPACK_DUNDEE \

Loading…
Cancel
Save