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

Commits on Oct 20, 2023

  1. Allow users to disable wsgi socket rotation (juju#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 996f241)
    Signed-off-by: zhhuabj <joshua.zhang@canonical.com>
    zhhuabj committed Oct 20, 2023
    Configuration menu
    Copy the full SHA
    ffa078d View commit details
    Browse the repository at this point in the history
  2. 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 1a90eb0)
    Signed-off-by: zhhuabj <joshua.zhang@canonical.com>
    dosaboy authored and zhhuabj committed Oct 20, 2023
    Configuration menu
    Copy the full SHA
    57010d4 View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2023

  1. 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 5b0a3e6)
    (cherry picked from commit 452988f)
    (cherry picked from commit d0a54fc)
    Signed-off-by: zhhuabj <joshua.zhang@canonical.com>
    rodrigogansobarbieri authored and zhhuabj committed Oct 26, 2023
    Configuration menu
    Copy the full SHA
    0564dab View commit details
    Browse the repository at this point in the history