Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 3 commits into from
Nov 2, 2023

Conversation

zhhuabj
Copy link
Contributor

@zhhuabj zhhuabj commented Oct 20, 2023

cherry-pick the commit 996f241 and 1a90eb0 to xena branch

zhhuabj and others added 2 commits October 20, 2023 17:06
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 996f241)
Signed-off-by: zhhuabj <joshua.zhang@canonical.com>
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 1a90eb0)
Signed-off-by: zhhuabj <joshua.zhang@canonical.com>
@sombrafam
Copy link
Contributor

This pep8 error that you're having on the 3.8 job was fixed in this commitment that also needs to be cherry-picked: d0a54fc

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 5b0a3e6)
(cherry picked from commit 452988f)
(cherry picked from commit d0a54fc)
Signed-off-by: zhhuabj <joshua.zhang@canonical.com>
@zhhuabj
Copy link
Contributor Author

zhhuabj commented Oct 26, 2023

This pep8 error that you're having on the 3.8 job was fixed in this commitment that also needs to be cherry-picked: d0a54fc

thanks a lot

Copy link
Contributor

@dosaboy dosaboy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@dosaboy dosaboy merged commit 4c3d0b7 into juju:stable/xena Nov 2, 2023
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants