From 81088a15a55a8f2f61de99f8be7fd3ee455b0fca Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Thu, 20 May 2021 11:01:07 +0800 Subject: [PATCH] inventory and python-inventoryclient: remove the recipes inventory and python-inventoryclient has been revomed from upstream: ``````````````````````````````````````````````` commit d59ba5fdc21a89581cdc4e3fad038645b9d20754 Author: Al Bailey Date: Tue Jan 7 08:41:36 2020 -0600 Remove unused inventory and python-inventoryclient Neither of these components were maintained or used, and so are being abandoned. - inventory was an old fork of the sysinv code - python-inventoryclient was an old fork of the cgts-client code The devstack commands, although currently disabled, have also been updated. Story: 2004515 Task: 37538 Depends-On: https://review.opendev.org/701591 Signed-off-by: Al Bailey ``````````````````````````````````````````````` Issue-ID: INF-215 Signed-off-by: Jackie Huang Change-Id: I84c27f2963b190b5e7340aa6cb4ae1c36130ea9e --- .../recipes-core/packagegroups/packagegroup-stx.bb | 2 - ...001-inventory-Remove-argparse-requirement.patch | 24 ------ .../meta-stx-flock/stx-metal/inventory.bb | 90 ---------------------- .../stx-metal/python-inventoryclient.bb | 33 -------- 4 files changed, 149 deletions(-) delete mode 100644 meta-starlingx/meta-stx-flock/stx-metal/files/0001-inventory-Remove-argparse-requirement.patch delete mode 100644 meta-starlingx/meta-stx-flock/stx-metal/inventory.bb delete mode 100644 meta-starlingx/meta-stx-flock/stx-metal/python-inventoryclient.bb diff --git a/meta-starlingx/meta-stx-distro/recipes-core/packagegroups/packagegroup-stx.bb b/meta-starlingx/meta-stx-distro/recipes-core/packagegroups/packagegroup-stx.bb index c65203d..6b910cc 100644 --- a/meta-starlingx/meta-stx-distro/recipes-core/packagegroups/packagegroup-stx.bb +++ b/meta-starlingx/meta-stx-distro/recipes-core/packagegroups/packagegroup-stx.bb @@ -113,7 +113,6 @@ RDEPENDS_packagegroup-stx-ha = " \ " RDEPENDS_packagegroup-stx-metal = " \ - inventory \ mtce \ mtce-pmon \ mtce-hwmon \ @@ -122,7 +121,6 @@ RDEPENDS_packagegroup-stx-metal = " \ mtce-compute \ mtce-control \ mtce-storage \ - python-inventoryclient \ pxe-network-installer \ platform-kickstarts \ " diff --git a/meta-starlingx/meta-stx-flock/stx-metal/files/0001-inventory-Remove-argparse-requirement.patch b/meta-starlingx/meta-stx-flock/stx-metal/files/0001-inventory-Remove-argparse-requirement.patch deleted file mode 100644 index 4784a0d..0000000 --- a/meta-starlingx/meta-stx-flock/stx-metal/files/0001-inventory-Remove-argparse-requirement.patch +++ /dev/null @@ -1,24 +0,0 @@ -From d42dc102aaca386f314808e771a56b9ecbd29876 Mon Sep 17 00:00:00 2001 -From: "Sar Ashki, Babak" -Date: Tue, 25 Feb 2020 13:58:15 -0800 -Subject: [PATCH] stx-metal: remove argparse requirement from inventory - ---- - inventory/inventory/requirements.txt | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/requirements.txt b/requirements.txt -index 993f224..82170c3 100644 ---- a/requirements.txt -+++ b/requirements.txt -@@ -6,7 +6,6 @@ pbr>=2.0 # Apache-2.0 - SQLAlchemy - amqplib>=0.6.1 - anyjson>=0.3.3 --argparse - eventlet==0.20.0 - futurist>=1.2.0 # Apache-2.0 - greenlet>=0.3.2 # MIT --- -2.23.0 - diff --git a/meta-starlingx/meta-stx-flock/stx-metal/inventory.bb b/meta-starlingx/meta-stx-flock/stx-metal/inventory.bb deleted file mode 100644 index b767ee6..0000000 --- a/meta-starlingx/meta-stx-flock/stx-metal/inventory.bb +++ /dev/null @@ -1,90 +0,0 @@ -require metal-common.inc - -SUBPATH0 = "inventory/inventory/" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" - -SRC_URI += "file://0001-inventory-Remove-argparse-requirement.patch" - -RDEPENDS_${PN} += " \ - bash \ - python-anyjson \ - python-amqplib \ - python-pyudev \ - python-pyparted \ - python-ipaddr \ - python-paste \ - python-eventlet \ - python-futurist \ - python-jsonpatch \ - python-keystoneauth1 \ - python-keystonemiddleware \ - python-neutronclient \ - python-oslo.concurrency \ - python-oslo.config \ - python-oslo.context \ - python-oslo.db \ - python-oslo.i18n \ - python-oslo.log \ - python-oslo.messaging \ - python-oslo.middleware \ - python-oslo.policy \ - python-oslo.rootwrap \ - python-oslo.serialization \ - python-oslo.service \ - python-oslo.utils \ - python-oslo.versionedobjects \ - python-osprofiler \ - python-pbr \ - python-pecan \ - python-psutil \ - python-requests \ - python-retrying \ - python-six \ - python-sqlalchemy \ - python-stevedore \ - python-webob \ - python-wsme \ - " - -DEPENDS += " \ - python-pbr-native \ - " - -inherit systemd -SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "inventory-api.service inventory-conductor.service" -SYSTEMD_AUTO_ENABLE_${PN} = "disable" - -inherit setuptools python-dir - - -do_install_append () { - - install -d -m 755 ${D}/${sysconfdir}/goenabled.d - install -p -D -m 755 etc/inventory/inventory_goenabled_check.sh ${D}/${sysconfdir}/goenabled.d/inventory_goenabled_check.sh - - install -d -m 755 ${D}/${sysconfdir}/inventory - install -p -D -m 755 etc/inventory/policy.json ${D}/${sysconfdir}/inventory/policy.json - - install -d -m 755 ${D}/${sysconfdir}/motd.d - install -p -D -m 755 etc/inventory/motd-system ${D}/${sysconfdir}/motd.d/10-system-config - - install -m 755 -p -D scripts/inventory-api ${D}/${libdir}/ocf/resource.d/platform/inventory-api - install -m 755 -p -D scripts/inventory-conductor ${D}/${libdir}/ocf/resource.d/platform/inventory-conductor - - install -d -m 0755 ${D}/${systemd_system_unitdir}/ - install -m 644 -p -D scripts/inventory-api.service ${D}/${systemd_system_unitdir}/ - install -m 644 -p -D scripts/inventory-conductor.service ${D}/${systemd_system_unitdir}/ - - # Install sql migration - install -m 644 inventory/db/sqlalchemy/migrate_repo/migrate.cfg \ - ${D}/${PYTHON_SITEPACKAGES_DIR}/inventory/db/sqlalchemy/migrate_repo/migrate.cfg - -} - -FILES_${PN}_append = " \ - ${libdir}/ocf/resource.d/platform/inventory-api \ - ${libdir}/ocf/resource.d/platform/inventory-conductor \ - " diff --git a/meta-starlingx/meta-stx-flock/stx-metal/python-inventoryclient.bb b/meta-starlingx/meta-stx-flock/stx-metal/python-inventoryclient.bb deleted file mode 100644 index 067ed73..0000000 --- a/meta-starlingx/meta-stx-flock/stx-metal/python-inventoryclient.bb +++ /dev/null @@ -1,33 +0,0 @@ -require metal-common.inc - -SUBPATH0 = "python-inventoryclient/inventoryclient" - - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" - -RDEPENDS_${PN}_append = " \ - python \ - python-pbr \ - python-six \ - python-oslo.i18n \ - python-oslo.utils \ - python-requests \ - bash \ - bash-completion \ - " - - -do_install_append () { - - install -d -m 755 ${D}/${sysconfdir}/bash_completion.d - install -p -D -m 664 tools/inventory.bash_completion ${D}/${sysconfdir}/bash_completion.d - -} - -_FILES_${PN}_append = " \ - ${bindir}/inventory \ - ${sysconfdir}/bash_completion.d/inventory.bash_completion \ - ${libdir}/python2.7/site-packages/inventoryclient-*.egg-info/ \ - ${libdir}/python2.7/site-packages/inventoryclient/ \ - " -- 2.16.6