starlingx/upstream
Code Issues Proposed changes

barbican: rebase patches onto 20.0.0-2

Browse Source 
Pick the meta_data.yaml from f/trixie branch:
    https://review.opendev.org/c/starlingx/upstream/+/955092

Minor context changes, a dropped hunk already applied upstream.

Test Plan:
PASS  master trixie build
PASS  ongoing integration work on the f/trixie branch
defer  build master trixie ISO

Story: 2011360
Task: 53180

Change-Id: I9990f12f81ebc9da8b49f2c81b272c570331f9a1
Signed-off-by: Michel Thebeau <Michel.Thebeau@windriver.com>
This commit is contained in:
Michel Thebeau
2025-07-17 17:25:30 +00:00
committed by Michel Thebeau
parent 906c6b1a59
commit fde8a7ded7
4 changed files with 102 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
debian_trixie_iso_image_std.inc
View File

@@ -1,12 +1,12 @@
# List of packages to be included/installed in ISO
#barbican
#barbican-api
#barbican-common
#barbican-doc
#barbican-keystone-listener
#barbican-worker
#python3-barbican
barbican-api
barbican-common
barbican-doc
barbican-keystone-listener
barbican-worker
python3-barbican
#keystone
#keystone-doc

2
debian_trixie_pkg_dirs_std
View File

@@ -1,4 +1,4 @@
#openstack/barbican
openstack/barbican
#openstack/keystone
openstack/openstack-pkg-tools
#openstack/openstack-ras

142
openstack/barbican/debian/trixie/deb_patches/0001-Remove-dbconfig-and-openstack-pkg-tools-config.patch
View File

@@ -1,7 +1,7 @@
From cb87c126b41efdc0956c5e9e9350a9edf8129f3d Mon Sep 17 00:00:00 2001
From e0fdf759a76ad9cdc6fde0bddcccd2415e2cbf19 Mon Sep 17 00:00:00 2001
From: Charles Short <charles.short@windriver.com>
Date: Mon, 22 Nov 2021 14:46:16 +0000
Subject: [PATCH] Remove dbconfig and openstack-pkg-tools config
Subject: [PATCH 1/3] Remove dbconfig and openstack-pkg-tools config
Remove the dbconfig and openstack-pkg-tools post configuration
since we use puppet to configure the services and doing
@@ -11,9 +11,31 @@ Story: 2009101
Task: 44026
Signed-off-by: Charles Short <charles.short@windriver.com>
diff -Naurp barbican-13.0.1.orig/debian/barbican-api.config.in barbican-13.0.1/debian/barbican-api.config.in
--- barbican-13.0.1.orig/debian/barbican-api.config.in 2021-04-20 09:59:15.000000000 +0000
+++ barbican-13.0.1/debian/barbican-api.config.in 1970-01-01 00:00:00.000000000 +0000
---
debian/barbican-api.config.in | 12 ------
debian/barbican-api.postinst.in | 17 --------
debian/barbican-common.config.in | 17 --------
debian/barbican-common.install | 3 ++
debian/barbican-common.posinst | 28 ++++++++++++++
debian/barbican-common.postinst.in | 46 ----------------------
debian/barbican-common.postrm | 14 +++++++
debian/barbican-common.postrm.in | 25 ------------
debian/control | 1 -
debian/rules | 62 ++----------------------------
10 files changed, 48 insertions(+), 177 deletions(-)
delete mode 100644 debian/barbican-api.config.in
delete mode 100755 debian/barbican-api.postinst.in
delete mode 100644 debian/barbican-common.config.in
create mode 100644 debian/barbican-common.posinst
delete mode 100755 debian/barbican-common.postinst.in
create mode 100644 debian/barbican-common.postrm
delete mode 100755 debian/barbican-common.postrm.in
diff --git a/debian/barbican-api.config.in b/debian/barbican-api.config.in
deleted file mode 100644
index 0954b79..0000000
--- a/debian/barbican-api.config.in
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
@@ -27,9 +49,11 @@ diff -Naurp barbican-13.0.1.orig/debian/barbican-api.config.in barbican-13.0.1/d
-db_go
-
-exit 0
diff -Naurp barbican-13.0.1.orig/debian/barbican-api.postinst.in barbican-13.0.1/debian/barbican-api.postinst.in
--- barbican-13.0.1.orig/debian/barbican-api.postinst.in 2021-04-20 09:59:15.000000000 +0000
+++ barbican-13.0.1/debian/barbican-api.postinst.in 1970-01-01 00:00:00.000000000 +0000
diff --git a/debian/barbican-api.postinst.in b/debian/barbican-api.postinst.in
deleted file mode 100755
index f53399f..0000000
--- a/debian/barbican-api.postinst.in
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
@@ -48,9 +72,11 @@ diff -Naurp barbican-13.0.1.orig/debian/barbican-api.postinst.in barbican-13.0.1
-#DEBHELPER#
-
-exit 0
diff -Naurp barbican-13.0.1.orig/debian/barbican-common.config.in barbican-13.0.1/debian/barbican-common.config.in
--- barbican-13.0.1.orig/debian/barbican-common.config.in 2021-04-20 09:59:15.000000000 +0000
+++ barbican-13.0.1/debian/barbican-common.config.in 1970-01-01 00:00:00.000000000 +0000
diff --git a/debian/barbican-common.config.in b/debian/barbican-common.config.in
deleted file mode 100644
index 14edb36..0000000
--- a/debian/barbican-common.config.in
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
@@ -69,18 +95,21 @@ diff -Naurp barbican-13.0.1.orig/debian/barbican-common.config.in barbican-13.0.
-db_go
-
-exit 0
diff -Naurp barbican-13.0.1.orig/debian/barbican-common.install barbican-13.0.1/debian/barbican-common.install
--- barbican-13.0.1.orig/debian/barbican-common.install 2021-04-20 09:59:15.000000000 +0000
+++ barbican-13.0.1/debian/barbican-common.install 2021-11-26 17:57:04.417749768 +0000
diff --git a/debian/barbican-common.install b/debian/barbican-common.install
index 37b2ca4..663fdc8 100644
--- a/debian/barbican-common.install
+++ b/debian/barbican-common.install
@@ -1,2 +1,5 @@
bin/barbican-api /usr/bin
usr/bin/*
+etc/barbican/barbican-api-paste.ini etc/barbican
+etc/barbican/barbican.conf etc/barbican
+etc/barbican/vassals/barbican-api.ini etc/barbican/vassals
diff -Naurp barbican-13.0.1.orig/debian/barbican-common.posinst barbican-13.0.1/debian/barbican-common.posinst
--- barbican-13.0.1.orig/debian/barbican-common.posinst 1970-01-01 00:00:00.000000000 +0000
+++ barbican-13.0.1/debian/barbican-common.posinst 2021-11-26 17:11:12.770838698 +0000
diff --git a/debian/barbican-common.posinst b/debian/barbican-common.posinst
new file mode 100644
index 0000000..9cf6a4c
--- /dev/null
+++ b/debian/barbican-common.posinst
@@ -0,0 +1,28 @@
+#!/bin/sh
+
@@ -110,9 +139,11 @@ diff -Naurp barbican-13.0.1.orig/debian/barbican-common.posinst barbican-13.0.1/
+#DEBHELPER#
+
+exit 0
diff -Naurp barbican-13.0.1.orig/debian/barbican-common.postinst.in barbican-13.0.1/debian/barbican-common.postinst.in
--- barbican-13.0.1.orig/debian/barbican-common.postinst.in 2021-04-20 09:59:15.000000000 +0000
+++ barbican-13.0.1/debian/barbican-common.postinst.in 1970-01-01 00:00:00.000000000 +0000
diff --git a/debian/barbican-common.postinst.in b/debian/barbican-common.postinst.in
deleted file mode 100755
index 3ba4702..0000000
--- a/debian/barbican-common.postinst.in
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh
-
@@ -160,9 +191,11 @@ diff -Naurp barbican-13.0.1.orig/debian/barbican-common.postinst.in barbican-13.
-#DEBHELPER#
-
-exit 0
diff -Naurp barbican-13.0.1.orig/debian/barbican-common.postrm barbican-13.0.1/debian/barbican-common.postrm
--- barbican-13.0.1.orig/debian/barbican-common.postrm 1970-01-01 00:00:00.000000000 +0000
+++ barbican-13.0.1/debian/barbican-common.postrm 2021-11-26 17:11:12.774838632 +0000
diff --git a/debian/barbican-common.postrm b/debian/barbican-common.postrm
new file mode 100644
index 0000000..8e7547f
--- /dev/null
+++ b/debian/barbican-common.postrm
@@ -0,0 +1,14 @@
+#!/bin/sh
+
@@ -178,9 +211,11 @@ diff -Naurp barbican-13.0.1.orig/debian/barbican-common.postrm barbican-13.0.1/d
+#DEBHELPER#
+
+exit 0
diff -Naurp barbican-13.0.1.orig/debian/barbican-common.postrm.in barbican-13.0.1/debian/barbican-common.postrm.in
--- barbican-13.0.1.orig/debian/barbican-common.postrm.in 2021-04-20 09:59:15.000000000 +0000
+++ barbican-13.0.1/debian/barbican-common.postrm.in 1970-01-01 00:00:00.000000000 +0000
diff --git a/debian/barbican-common.postrm.in b/debian/barbican-common.postrm.in
deleted file mode 100755
index 9365d52..0000000
--- a/debian/barbican-common.postrm.in
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-
@@ -207,10 +242,11 @@ diff -Naurp barbican-13.0.1.orig/debian/barbican-common.postrm.in barbican-13.0.
-#DEBHELPER#
-
-exit 0
diff -Naurp barbican-13.0.1.orig/debian/control barbican-13.0.1/debian/control
--- barbican-13.0.1.orig/debian/control 2021-04-20 09:59:15.000000000 +0000
+++ barbican-13.0.1/debian/control 2021-11-26 17:11:12.774838632 +0000
@@ -96,7 +96,6 @@ Package: barbican-common
diff --git a/debian/control b/debian/control
index ddf5b7f..7c9e1bb 100644
--- a/debian/control
+++ b/debian/control
@@ -92,7 +92,6 @@ Package: barbican-common
Architecture: all
Depends:
adduser,
@@ -218,22 +254,20 @@ diff -Naurp barbican-13.0.1.orig/debian/control barbican-13.0.1/debian/control
debconf,
python3-barbican (= ${binary:Version}),
${misc:Depends},
diff -Naurp barbican-13.0.1.orig/debian/rules barbican-13.0.1/debian/rules
--- barbican-13.0.1.orig/debian/rules 2025-01-09 23:21:13.602619091 -0300
+++ barbican-13.0.1/debian/rules 2025-01-10 10:24:52.593299528 -0300
@@ -3,22 +3,12 @@
include /usr/share/openstack-pkg-tools/pkgos.make
%:
- dh $@ --buildsystem=python_distutils --with python3,sphinxdoc
+ dh $@ --buildsystem=pybuild --with python3,sphinxdoc
override_dh_auto_clean:
diff --git a/debian/rules b/debian/rules
index e9d61a2..441cadb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,21 +9,11 @@ override_dh_auto_clean:
rm -f debian/*.init debian/*.service debian/*.upstart
rm -rf build
rm -rf barbican.sqlite
rm -rf barbican.sqlite debian/po debian/barbican-api.templates debian/barbican-common.templates
- rm -f debian/barbican-api.postinst debian/barbican-api.config debian/barbican-common.postinst debian/barbican-common.config debian/barbican-common.postrm
-
find $(CURDIR) -type f -iname '*.pyc' -delete || true
find $(CURDIR) -type d -iname __pycache__ -exec rm -rf {} \; || true
rm -rf *.egg-info
rm -f doc/source/_static/barbican.conf.sample doc/source/_static/barbican.policy.yaml.sample
-override_dh_auto_build:
- /usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func barbican-api.postinst
- /usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func barbican-api.config
@@ -242,12 +276,13 @@ diff -Naurp barbican-13.0.1.orig/debian/rules barbican-13.0.1/debian/rules
- /usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_postrm barbican-common.postrm
- pkgos-merge-templates barbican-api barbican endpoint
- pkgos-merge-templates barbican-common barbican db rabbit ksat
-
override_dh_auto_test:
echo "Do nothing..."
@@ -34,49 +24,9 @@ override_dh_install:
ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
pkgos-dh_auto_test --no-py2 'barbican\.tests\.(?!(.*common.test_utils\.WhenTestingAcceptEncodingGetter\.test_get_correct_fullname_for_class.*|.*common\.test_utils\.WhenTestingGenerateFullClassnameForInstance\.test_returns_qualified_name.*|.*plugin\.interface\.test_certificate_manager\.WhenTestingCertificateEventPluginManager\.test_get_plugin_by_name.*|.*plugin\.interface\.test_certificate_manager\.WhenTestingCertificatePluginManager\.test_get_plugin_by_ca_id.*|.*plugin\.interface\.test_certificate_manager\.WhenTestingCertificatePluginManager\.test_get_plugin_by_name.*|.*plugin\.interface\.test_certificate_manager\.WhenTestingCertificatePluginManager\.test_refresh_ca_list.*|.*plugin\.test_kmip\.WhenTestingKMIPSecretStore\.test_delete_secret_assert_called.*|.*plugin\.test_kmip\.WhenTestingKMIPSecretStore\.test_generate_asymmetric_key_assert_called.*|.*plugin\.test_kmip\.WhenTestingKMIPSecretStore\.test_generate_symmetric_key_assert_called.*|.*plugin\.test_kmip\.WhenTestingKMIPSecretStore\.test_get_secret_opaque.*|.*plugin\.test_kmip\.WhenTestingKMIPSecretStore\.test_get_secret_private_key.*|.*plugin\.test_kmip\.WhenTestingKMIPSecretStore\.test_get_secret_public_key.*|.*plugin\.test_kmip\.WhenTestingKMIPSecretStore\.test_get_secret_symmetric.*|.*plugin\.test_kmip\.WhenTestingKMIPSecretStore\.test_store_private_key_secret_assert_called.*|.*plugin\.test_kmip\.WhenTestingKMIPSecretStore\.test_store_symmetric_secret_assert_called.*|.*tasks\.test_keystone_consumer\.WhenUsingKeystoneEventConsumerProcessMethod\.test_existing_project_entities_cleanup_for_plain_secret.*|.*plugin\.test_kmip\.WhenTestingKMIPSecretStore\.test_credential.*|.*test_hacking\.HackingTestCase\.test_logging_with_tuple_argument.*|.*common\.test_validators\.WhenTestingSecretMetadataValidator\.test_should_validate_all_fields_and_make_key_lowercase.*|.*test_hacking\.HackingTestCase\.test_str_on_exception.*|.*test_hacking\.HackingTestCase\.test_str_on_multiple_exceptions.*|.*test_hacking\.HackingTestCase\.test_str_unicode_on_multiple_exceptions.*|.*test_hacking\.HackingTestCase\.test_unicode_on_exception.*|.*common\.test_validators\.WhenTestingSimpleCMCOrderValidator\.test_should_raise_with_unsigned_pkcs10_data.*))'
@@ -40,55 +30,9 @@ ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
# barbican.tests.queue.test_keystone_listener.WhenUsingNotificationTask.*
pkgos-dh_auto_test --no-py2 'barbican\.tests\.(?!(.*common.test_utils\.WhenTestingAcceptEncodingGetter\.test_get_correct_fullname_for_class.*|.*common\.test_utils\.WhenTestingGenerateFullClassnameForInstance\.test_returns_qualified_name.*|.*plugin\.interface\.test_certificate_manager\.WhenTestingCertificateEventPluginManager\.test_get_plugin_by_name.*|.*plugin\.interface\.test_certificate_manager\.WhenTestingCertificatePluginManager\.test_get_plugin_by_ca_id.*|.*plugin\.interface\.test_certificate_manager\.WhenTestingCertificatePluginManager\.test_get_plugin_by_name.*|.*plugin\.interface\.test_certificate_manager\.WhenTestingCertificatePluginManager\.test_refresh_ca_list.*|.*plugin\.test_kmip\.WhenTestingKMIPSecretStore\.test_delete_secret_assert_called.*|.*plugin\.test_kmip\.WhenTestingKMIPSecretStore\.test_generate_asymmetric_key_assert_called.*|.*plugin\.test_kmip\.WhenTestingKMIPSecretStore\.test_generate_symmetric_key_assert_called.*|.*plugin\.test_kmip\.WhenTestingKMIPSecretStore\.test_get_secret_opaque.*|.*plugin\.test_kmip\.WhenTestingKMIPSecretStore\.test_get_secret_private_key.*|.*plugin\.test_kmip\.WhenTestingKMIPSecretStore\.test_get_secret_public_key.*|.*plugin\.test_kmip\.WhenTestingKMIPSecretStore\.test_get_secret_symmetric.*|.*plugin\.test_kmip\.WhenTestingKMIPSecretStore\.test_store_private_key_secret_assert_called.*|.*plugin\.test_kmip\.WhenTestingKMIPSecretStore\.test_store_symmetric_secret_assert_called.*|.*tasks\.test_keystone_consumer\.WhenUsingKeystoneEventConsumerProcessMethod\.test_existing_project_entities_cleanup_for_plain_secret.*|.*plugin\.test_kmip\.WhenTestingKMIPSecretStore\.test_credential.*|.*test_hacking\.HackingTestCase\.test_logging_with_tuple_argument.*|.*common\.test_validators\.WhenTestingSecretMetadataValidator\.test_should_validate_all_fields_and_make_key_lowercase.*|.*test_hacking\.HackingTestCase\.test_str_on_exception.*|.*test_hacking\.HackingTestCase\.test_str_on_multiple_exceptions.*|.*test_hacking\.HackingTestCase\.test_str_unicode_on_multiple_exceptions.*|.*test_hacking\.HackingTestCase\.test_unicode_on_exception.*|.*common\.test_validators\.WhenTestingSimpleCMCOrderValidator\.test_should_raise_with_unsigned_pkcs10_data.*|.*test_keystone_listener\.WhenUsingNotificationTask.*))'
endif
-
- # Generate the barbican.conf config using installed python-barbican files.
@@ -255,8 +290,6 @@ diff -Naurp barbican-13.0.1.orig/debian/rules barbican-13.0.1/debian/rules
- PYTHONPATH=$(CURDIR)/debian/tmp/usr/lib/python3/dist-packages oslo-config-generator \
- --output-file $(CURDIR)/debian/barbican-common/usr/share/barbican-common/barbican.conf \
- --wrap-width 140 \
- --namespace barbican.certificate.plugin \
- --namespace barbican.certificate.plugin.snakeoil \
- --namespace barbican.common.config \
- --namespace barbican.plugin.crypto \
- --namespace barbican.plugin.crypto.p11 \
@@ -264,15 +297,23 @@ diff -Naurp barbican-13.0.1.orig/debian/rules barbican-13.0.1/debian/rules
- --namespace barbican.plugin.dogtag \
- --namespace barbican.plugin.secret_store \
- --namespace barbican.plugin.secret_store.kmip \
- --namespace barbican.plugin.secret_store.vault \
- --namespace barbican.certificate.plugin \
- --namespace barbican.certificate.plugin.snakeoil \
- --namespace barbican.common.config \
- --namespace keystonemiddleware.audit \
- --namespace keystonemiddleware.auth_token \
- --namespace oslo.log \
- --namespace oslo.messaging \
- --namespace oslo.middleware.cors \
- --namespace oslo.middleware.healthcheck \
- --namespace oslo.middleware.http_proxy_to_wsgi \
- --namespace oslo.policy \
- --namespace oslo.service.periodic_task \
- --namespace oslo.service.service \
- --namespace oslo.service.sslutils \
- --namespace oslo.service.wsgi
-
- pkgos-readd-keystone-authtoken-missing-options $(CURDIR)/debian/barbican-common/usr/share/barbican-common/barbican.conf keystone_authtoken barbican
-
- # Same with policy.conf
@@ -298,3 +339,6 @@ diff -Naurp barbican-13.0.1.orig/debian/rules barbican-13.0.1/debian/rules
dh_install
rm -rf $(CURDIR)/debian/tmp/usr/etc
dh_missing --fail-missing
--
2.34.1

4
openstack/barbican/debian/trixie/meta_data.yaml
View File

@@ -1,7 +1,7 @@
---
debname: barbican
debver: 13.0.0-1
archive: https://snapshot.debian.org/archive/debian/20211201T030112Z/pool/main/b/barbican/
debver: 20.0.0-2
archive: https://snapshot.debian.org/archive/debian/20250630T203427Z/pool/main/b/barbican/
revision:
dist: $STX_DIST
GITREVCOUNT: