charm-helpers:stable/antelope

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

Branch merges

Branch information

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

Recent commits

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

Merge pull request #896 from dosaboy/bug/1920770-antelope

Support checking service ports with ssl connection

4a65a1b... by Edward Hope-Morley

Support checking service ports with ssl connection

By default netcat is used to check if a service is
listening on a port. This is generally ok except
for services expecting SSL connections which need
to be properly closed and netcat can't do that. So
here we add support for optionally using the python
ssl library to create an ssl connection to the port
and close it properly once finished.

Related-Bug: #1920770
(cherry picked from commit 0071e273720d65aca00b49fbde99c3b3ed1d0385)
(cherry picked from commit f9912337783aec2a974bb6a3d49e4ed717d0c521)

b884b20... by Brian Haley

Skip service_enable if already enabled (#885)

Repeatedly calling service_enable for a service that
is already enabled can lead to unintended consequences.
Some charms frequently call servie_resume which will
call service('enable') and this adds a check to only
do so of the service is not enabled.

Related-Bug: #2058505
(cherry picked from commit a3345005e597f098909b7c12dfee630a366ce0f6)

Co-authored-by: Edward Hope-Morley <email address hidden>

f5efeef... by Felipe Reyes

Merge pull request #879 from rodrigogansobarbieri/antelope_fix-image-volume-ambiguous-configuration

[antelope] Set service_user_id from keystone relation

33d4379... by Alex Kavanagh <email address hidden>

Merge pull request #851 from coreycb/bug/2037751/antelope

Drop @cached decorator from openstack_release()

7e325de... by Erlon R. Cruz

Set service_user_id from keystone relation

This is necessary so we can avoid ambiguities (by using the id vs
name) when we want to use the service user.

(cherry picked from commit f7e65d27b1f93fe00bca13ed3ce741dce3eb9101)
(cherry picked from commit 2320efdf793de0cea35fcedd531096e051e970a2)

2006e87... by Felipe Reyes

Merge pull request #867 from coreycb/swift-version-antelope

Drop use of get_os_version_codename_swift [antelope backport]

730369e... by Corey Bryant

Unit test updates for get_os_version_codename_swift removal

(cherry picked from commit 62a356c639ca6ae0d3b34a77c1bae027a3c0b54a)

620171d... 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)

e99aca9... by Hua Zhang

cherry-pick the fix for lp bug 2021550 to antelope branch (#857)

* 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>

---------

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