sysinv: update for stx 5.0
* remove 0001-stx-config-remove-argparse-requirement-from-sysinv.patch which is not needed since it has been fixed in stx 5.0 * rebase 0001-sriovph-bring-up.patch * update the do_install according to the spec for stx 5.0 * update the dependencies Story: 2008952 Task: 42576 Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Change-Id: I9fcbe08c166925617cc73232c7bfc277f7a2e13b
This commit is contained in:
Jackie Huang
parent
260b6dd142
commit
416ded21d2
35
meta-stx-flock/stx-config/files/0001-sriovph-bring-up.patch
Normal file
35
meta-stx-flock/stx-config/files/0001-sriovph-bring-up.patch
Normal file
@ -0,0 +1,35 @@
|
||||
From 8ae7bb222898be2810e29a40c5852a255682e144 Mon Sep 17 00:00:00 2001
|
||||
From: Jackie Huang <jackie.huang@windriver.com>
|
||||
Date: Fri, 14 May 2021 18:47:07 +0800
|
||||
Subject: [PATCH] sriovph-bring-up
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
rebase for stx 5.0
|
||||
|
||||
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
|
||||
---
|
||||
sysinv/puppet/interface.py | 7 +++++--
|
||||
1 file changed, 5 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/sysinv/puppet/interface.py b/sysinv/puppet/interface.py
|
||||
index 4dd4019..eea0565 100644
|
||||
--- a/sysinv/puppet/interface.py
|
||||
+++ b/sysinv/puppet/interface.py
|
||||
@@ -969,8 +969,11 @@ def get_ethernet_network_config(context, iface, config):
|
||||
if iface['iftype'] == constants.INTERFACE_TYPE_ETHERNET:
|
||||
sriovfs_path = ("/sys/class/net/%s/device/sriov_numvfs" %
|
||||
get_interface_port_name(context, iface))
|
||||
- options['pre_up'] = "echo 0 > %s; echo %s > %s" % (
|
||||
- sriovfs_path, iface['sriov_numvfs'], sriovfs_path)
|
||||
+ sriovpf_up_cmd = ("ifconfig %s up" %
|
||||
+ get_interface_port_name(context, iface))
|
||||
+ options['pre_up'] = "echo 0 > %s; echo %s > %s; %s" % (
|
||||
+ sriovfs_path, iface['sriov_numvfs'], sriovfs_path, sriovpf_up_cmd)
|
||||
+
|
||||
elif interface_class == constants.INTERFACE_CLASS_PCI_PASSTHROUGH:
|
||||
sriovfs_path = ("/sys/class/net/%s/device/sriov_numvfs" %
|
||||
get_interface_port_name(context, iface))
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
From 06a156e04df427f51b42b1093577823c558166ad Mon Sep 17 00:00:00 2001
|
||||
From: "Sar Ashki, Babak" <Babak.SarAshki@windriver.com>
|
||||
Date: Tue, 25 Feb 2020 13:50:37 -0800
|
||||
Subject: [PATCH] stx-config: remove argparse requirement from sysinv.
|
||||
|
||||
argparse is part of stdlib
|
||||
---
|
||||
requirements.txt | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/requirements.txt b/requirements.txt
|
||||
index fb4ef6a1..12a341c7 100644
|
||||
--- a/requirements.txt
|
||||
+++ b/requirements.txt
|
||||
@@ -2,7 +2,6 @@ pbr>=0.5
|
||||
SQLAlchemy
|
||||
amqplib>=0.6.1
|
||||
anyjson>=0.3.3
|
||||
-argparse
|
||||
boto3
|
||||
botocore>=1.11.0
|
||||
cryptography!=2.0 # BSD/Apache-2.0
|
||||
--
|
||||
2.23.0
|
||||
|
||||
@ -1,16 +0,0 @@
|
||||
diff -ruN a/sysinv/sysinv/sysinv/sysinv/puppet/interface.py b/sysinv/sysinv/sysinv/sysinv/puppet/interface.py
|
||||
--- a/sysinv/sysinv/sysinv/sysinv/puppet/interface.py 2020-05-19 09:09:32.685727476 +0000
|
||||
+++ b/sysinv/sysinv/sysinv/sysinv/puppet/interface.py 2020-05-19 09:10:34.225727195 +0000
|
||||
@@ -938,8 +938,10 @@
|
||||
# others share the same pci-sriov sysfs enabling mechanism
|
||||
sriovfs_path = ("/sys/class/net/%s/device/sriov_numvfs" %
|
||||
get_interface_port_name(context, iface))
|
||||
- options['pre_up'] = "echo 0 > %s; echo %s > %s" % (
|
||||
- sriovfs_path, iface['sriov_numvfs'], sriovfs_path)
|
||||
+ sriovpf_up_cmd = ("ifconfig %s up" %
|
||||
+ get_interface_port_name(context, iface))
|
||||
+ options['pre_up'] = "echo 0 > %s; echo %s > %s; %s" % (
|
||||
+ sriovfs_path, iface['sriov_numvfs'], sriovfs_path, sriovpf_up_cmd)
|
||||
elif interface_class == constants.INTERFACE_CLASS_PCI_PASSTHROUGH:
|
||||
sriovfs_path = ("/sys/class/net/%s/device/sriov_numvfs" %
|
||||
get_interface_port_name(context, iface))
|
||||
@ -5,51 +5,66 @@ SUBPATH0 = "sysinv/sysinv/sysinv"
|
||||
LICENSE = "Apache-2.0"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
|
||||
|
||||
SRC_URI += "file://0001-stx-config-remove-argparse-requirement-from-sysinv.patch \
|
||||
SRC_URI += " \
|
||||
file://0001-sriovph-bring-up.patch \
|
||||
file://0002-cgts-client-handle-exceptions-other-than-CalledProcessErr.patch;striplevel=4 \
|
||||
file://sriovph-bring-up.patch;striplevel=4 \
|
||||
"
|
||||
|
||||
RDEPENDS_${PN}_append = " python bash"
|
||||
DEPENDS += " \
|
||||
python-pbr-native \
|
||||
"
|
||||
RDEPENDS_${PN}_append = " \
|
||||
python-anyjson \
|
||||
bash \
|
||||
gptfdisk \
|
||||
python \
|
||||
python-amqp \
|
||||
python-amqplib \
|
||||
python-passlib \
|
||||
python-websockify \
|
||||
python-pyparted \
|
||||
python-anyjson \
|
||||
python-boto3 \
|
||||
python-botocore \
|
||||
python-coverage \
|
||||
python-django \
|
||||
python-docker \
|
||||
python-eventlet \
|
||||
python-ipaddr \
|
||||
python-jsonpatch \
|
||||
python-keyring \
|
||||
python-keystoneauth1 \
|
||||
python-keystonemiddleware \
|
||||
python-kubernetes \
|
||||
python-mox3 \
|
||||
python-netaddr \
|
||||
python-pyudev \
|
||||
python-oslo.concurrency \
|
||||
python-oslo.config \
|
||||
python-oslo.db \
|
||||
python-oslo.i18n \
|
||||
python-oslo.log \
|
||||
python-oslo.rootwrap \
|
||||
python-oslo.serialization \
|
||||
python-oslo.service \
|
||||
python-oslo.utils \
|
||||
python-paramiko \
|
||||
python-passlib \
|
||||
python-paste \
|
||||
python-pbr \
|
||||
python-pecan \
|
||||
python-psutil \
|
||||
python-pyghmi \
|
||||
python-pyparted \
|
||||
python-pyudev \
|
||||
python-pyudev \
|
||||
python-requests \
|
||||
python-retrying \
|
||||
python-six \
|
||||
python-sqlalchemy \
|
||||
python-stevedore \
|
||||
python-webob \
|
||||
python-websockify \
|
||||
python-webtest \
|
||||
python-wsme \
|
||||
python-six \
|
||||
python-django \
|
||||
python-mox3 \
|
||||
python-oslo.i18n \
|
||||
python-oslo.config \
|
||||
python-oslo.concurrency \
|
||||
python-oslo.db \
|
||||
python-oslo.log \
|
||||
python-oslo.utils \
|
||||
python-pecan \
|
||||
python2-rpm \
|
||||
python-pyghmi \
|
||||
python-paramiko \
|
||||
tsconfig \
|
||||
resource-agents \
|
||||
gptfdisk \
|
||||
tsconfig \
|
||||
"
|
||||
|
||||
inherit setuptools python-dir systemd useradd
|
||||
@ -88,12 +103,15 @@ do_install_append() {
|
||||
|
||||
#install -p -D -m 755 ${D}/usr/bin/sysinv-api ${D}/usr/bin/sysinv-api
|
||||
#install -p -D -m 755 ${D}/usr/bin/sysinv-agent ${D}/usr/bin/sysinv-agent
|
||||
#install -p -D -m 755 ${D}/usr/bin/sysinv-fpga-agent ${D}/usr/bin/sysinv-fpga-agent
|
||||
#install -p -D -m 755 ${D}/usr/bin/sysinv-conductor ${D}/usr/bin/sysinv-conductor
|
||||
|
||||
install -d -m 755 ${D}${bindir}/
|
||||
install -p -D -m 755 sysinv/cmd/partition_info.sh ${D}${bindir}/partition_info.sh
|
||||
install -p -D -m 755 sysinv/cmd/manage-partitions ${D}${bindir}/manage-partitions
|
||||
install -p -D -m 755 sysinv/cmd/query_pci_id ${D}${bindir}/query_pci_id
|
||||
install -p -D -m 755 scripts/partition_info.sh ${D}${bindir}/partition_info.sh
|
||||
install -p -D -m 755 scripts/validate-platform-backup.sh ${D}${bindir}/validate-platform-backup.sh
|
||||
install -p -D -m 755 scripts/manage-partitions ${D}${bindir}/manage-partitions
|
||||
install -p -D -m 755 scripts/query_pci_id ${D}${bindir}/query_pci_id
|
||||
install -p -D -m 755 scripts/kube-cert-rotation.sh ${D}${bindir}/kube-cert-rotation.sh
|
||||
|
||||
sed -i -e 's|/usr/local/bin|${bindir}|' \
|
||||
${D}${libdir}/python2.7/site-packages/sysinv/common/constants.py \
|
||||
|
||||
Loading…
Reference in New Issue
Block a user