charm-helpers:stable/xena

Last commit made on 2024-03-04
Get this branch:
git clone -b stable/xena https://git.launchpad.net/charm-helpers

Branch merges

Branch information

Name:
stable/xena
Repository:
lp:charm-helpers

Recent commits

bd26855... by Alex Kavanagh <email address hidden>

Merge pull request #854 from coreycb/bug/2037751/xena

Drop @cached decorator from openstack_release()

23db587... by Felipe Reyes

Merge pull request #870 from coreycb/swift-version-xena

Drop use of get_os_version_codename_swift [xena backport]

4c3d0b7... by Hua Zhang

cherry-pick the fix for lp bug 2021550 to xena branch (#858)

* Allow users to disable wsgi socket rotation (#801)

The lp bug 1863232 introduced a new configuration option called
WSGISocketRotation which allows users to disable socket rotation on the apache
side. This patch will also allow setting this option on the charm side.

Other gerrit review links:
horizon: https://review.opendev.org/c/openstack/charm-openstack-dashboard/+/886373
cinder: https://review.opendev.org/c/openstack/charm-cinder/+/886356
keystone: https://review.opendev.org/c/openstack/charm-keystone/+/886377
ncc: https://review.opendev.org/c/openstack/charm-nova-cloud-controller/+/885836

Partial-Bug: 2021550
(cherry picked from commit 996f2410632b44a7dc207cc4bbfc1a38c83140a8)
Signed-off-by: zhhuabj <email address hidden>

* Rename wsgi-rotation to wsgi-socket-rotation

Commit 996f241 added support for new config option
'wsgi-rotation' but that name should have been
'wsgi-socket-rotation' in order to have a 1:1 relation
with the apache config it changes. The following patches
that implement this config are currently blocked until
this lands so that they can be synced before merge:

 * https://review.opendev.org/c/openstack/charm-ceilometer/+/887793
 * https://review.opendev.org/c/openstack/charm-cinder/+/886356
 * https://review.opendev.org/c/openstack/charm-glance/+/886376
 * https://review.opendev.org/c/openstack/charm-keystone/+/886377
 * https://review.opendev.org/c/openstack/charm-nova-cloud-controller/+/885836
 * https://review.opendev.org/c/openstack/charm-openstack-dashboard/+/886373

Related-Bug: #2021550
(cherry picked from commit 1a90eb03052102a2e8d906262f97e7f3ff87fcdc)
Signed-off-by: zhhuabj <email address hidden>

* Fix pep8 error in assert type comparison

charmhelpers/fetch/snap.py:55:12: E721 do not compare types,
for exact checks use `is` / `is not`,
for instance checks use `isinstance()`

(cherry picked from commit 5b0a3e6aa3e3141d70120aad7dd2c321595d7225)
(cherry picked from commit 452988fad4a5833d6946fd92906c57bee0b37fe7)
(cherry picked from commit d0a54fcadc8da54cd3ee7f9100fc2ac867698ad0)
Signed-off-by: zhhuabj <email address hidden>

---------

Signed-off-by: zhhuabj <email address hidden>
Co-authored-by: Edward Hope-Morley <email address hidden>
Co-authored-by: Rodrigo Barbieri <email address hidden>

54904e4... by Corey Bryant

Unit test updates for get_os_version_codename_swift removal

(cherry picked from commit 62a356c639ca6ae0d3b34a77c1bae027a3c0b54a)

eb09315... by Corey Bryant

Drop use of get_os_version_codename_swift

Swift payload upgrades to wallaby or later currently fail because
this code is unable to determine the version for wallaby+. For
example:

FATAL ERROR: Could not derive swift version for codename: wallaby

We stopped maintaining the SWIFT_CODENAMES and PACKAGE_CODENAMES as of
wallaby because the openstack-release package was introduced in wallaby.

We could update the SWIFT_CODENAMES map, but really this map no longer
needs to be used. There was a time when the same swift package version
existed in two different OpenStack releases, but that is no longer the
case [1]. Therefore we can use the same comparison used for OpenStack
packages which essentially checks current release (based on the
openstack-release package) vs the installation source release.

[1] Current swift versions in Ubuntu are:
2.32.0 bobcat
2.31.1 antelope
2.30.1 zed
2.29.2 yoga
2.28.1 xena
2.27.0 wallaby
2.26.0 victoria
2.25.2 ussuri

Closes-Bug: #2040606
(cherry picked from commit b604d56223772c36f934c199abb849d5d020fdc8)

b483251... by Corey Bryant

Drop @cached decorator from openstack_release()

The openstack_release() function is typically called (indirectly)
by os_release() which already does caching. The caching of
openstack_release() was preventing updates to the value during
upgrading to a new release of openstack.

Closes-Bug: #2037751
(cherry picked from commit b2d56ea0da322534de6295b0b09540dedf583e3c)

75326e3... by James Page

Merge pull request #828 from juju/bug/2028683/stable/xena

[stable/xena] Ensure get_requests_for_local_unit doesn't fail on incomplete relation (#824)

0cbe0a0... by Alex Kavanagh <email address hidden>

[stable/xena] Ensure get_requests_for_local_unit doesn't fail on incomplete relation (#824)

If the certificates relation has been set from a consuming charm for
certificates, but the provider hasn't supplied a certificate, and the
request is in the 'legacy' form, then the get_request_for_local_unit()
function in cert_utils fails on accessing the (non-existant) 'ca'
parameter in the databag. This patch ensures that if the 'ca' key is
missing that the processing moves on to the next relation.

(cherry-picked from: c8f47207c1f1652ab2cbecaaad8a83b66f004e5e)
Closes LP#2028683

cfab7e4... by Billy Olsen <email address hidden>

Merge pull request #817 from coreycb/xena-use-service-domain

[stable/xena] Use service_domain in [service_user] section

0cdd983... by Corey Bryant

Use service_domain in [service_user] section

The keystone charm currently creates two service users, one for the
service domain (for v3 authentication), and the other for the default
domain (for v2 authentication).

This patch updates the [service_user] config to use the service
domain.

Closes-Bug: #2026202
(cherry picked from commit 3ed0675a763a32a5ecd89c448a2b7e8e3a9f63b3)