From a62bcd81b93d1f6a93f2c50830fda831c9c24aff Mon Sep 17 00:00:00 2001 From: Jorge Saffe Date: Thu, 12 May 2022 19:19:20 -0400 Subject: [PATCH] Debian: Add package for puppet-module-horizon-17.4.0. Aligned with Debian Bullseye version puppet-module-horizon-17.4.0-4. Test Plan: * Debian distro: Fresh Install with AIO-SX. Story: 2009965 Task: 45356 Signed-off-by: Jorge Saffe Change-Id: Ie2ced3dfa45748438bc6fb975ae0f0f108694a16 --- .../debian/meta_data.yaml | 11 +++++++ .../0001-Fix-exceptions-import-issue.patch | 32 +++++++++++++++++++ .../debian/patches/series | 1 + debian_pkg_dirs | 1 + 4 files changed, 45 insertions(+) create mode 100644 config/puppet-modules/openstack/puppet-horizon-17.4.0/debian/meta_data.yaml create mode 100644 config/puppet-modules/openstack/puppet-horizon-17.4.0/debian/patches/0001-Fix-exceptions-import-issue.patch create mode 100644 config/puppet-modules/openstack/puppet-horizon-17.4.0/debian/patches/series diff --git a/config/puppet-modules/openstack/puppet-horizon-17.4.0/debian/meta_data.yaml b/config/puppet-modules/openstack/puppet-horizon-17.4.0/debian/meta_data.yaml new file mode 100644 index 000000000..fa8cbfc77 --- /dev/null +++ b/config/puppet-modules/openstack/puppet-horizon-17.4.0/debian/meta_data.yaml @@ -0,0 +1,11 @@ +--- +debname: puppet-module-horizon +debver: 17.4.0-4 +dl_path: + name: puppet-module-horizon-debian-17.4.0-4.tar.gz + url: https://salsa.debian.org/openstack-team/puppet/puppet-module-horizon/-/archive/debian/17.4.0-4/puppet-module-horizon-debian-17.4.0-4.tar.gz + sha256sum: 1b0f30451668f051e05f5de221bc57244eb3b3add6ba72ad20b6b1130333afd2 + md5sum: 8f7d38cb4f44f820b24518e82059f5d7 +revision: + dist: $STX_DIST + PKG_GITREVCOUNT: true diff --git a/config/puppet-modules/openstack/puppet-horizon-17.4.0/debian/patches/0001-Fix-exceptions-import-issue.patch b/config/puppet-modules/openstack/puppet-horizon-17.4.0/debian/patches/0001-Fix-exceptions-import-issue.patch new file mode 100644 index 000000000..fb4940db1 --- /dev/null +++ b/config/puppet-modules/openstack/puppet-horizon-17.4.0/debian/patches/0001-Fix-exceptions-import-issue.patch @@ -0,0 +1,32 @@ +From f8345f5a23f681d799acd7ed0288f37dbedbe619 Mon Sep 17 00:00:00 2001 +From: lsampaio +Date: Mon, 9 May 2022 15:05:43 -0300 +Subject: [PATCH] Fix exceptions import issue + +The puppet-module horizon 17.4.0-4 version has an error in the +debian packaging. The "fix-local-settings-for-debian.patch" +(included in the package) removes wrongly the +openstack_dashboard.exceptions import. This module overrides the +openstack-dashboard local_settings.py module during the unlocking +process and horizon service fails to get enabled. + +Signed-off-by: Jorge Saffe +--- + templates/local_settings.py.erb | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/templates/local_settings.py.erb b/templates/local_settings.py.erb +index 5796a0f..cb24bf4 100644 +--- a/templates/local_settings.py.erb ++++ b/templates/local_settings.py.erb +@@ -19,6 +19,7 @@ from django.utils.translation import ugettext_lazy as _ + from horizon.utils import secret_key + + from openstack_dashboard.settings import HORIZON_CONFIG ++from openstack_dashboard import exceptions + + DEBUG = <%= @django_debug.to_s.capitalize %> + +-- +2.35.1 + diff --git a/config/puppet-modules/openstack/puppet-horizon-17.4.0/debian/patches/series b/config/puppet-modules/openstack/puppet-horizon-17.4.0/debian/patches/series new file mode 100644 index 000000000..df9ef9d4c --- /dev/null +++ b/config/puppet-modules/openstack/puppet-horizon-17.4.0/debian/patches/series @@ -0,0 +1 @@ +0001-Fix-exceptions-import-issue.patch diff --git a/debian_pkg_dirs b/debian_pkg_dirs index 30b3f485d..120225dba 100644 --- a/debian_pkg_dirs +++ b/debian_pkg_dirs @@ -16,6 +16,7 @@ config/facter config/puppet-5.5.22 config/puppet-modules/openstack/puppet-ceph-2.4.1 config/puppet-modules/openstack/puppet-keystone-17.4.0 +config/puppet-modules/openstack/puppet-horizon-17.4.0 config/puppet-modules/openstack/puppet-openstacklib-17.4.0 config/puppet-modules/openstack/puppet-oslo-17.4.0 config/puppet-modules/puppet-boolean-2.0.2