openstack/charm-ceph-radosgw
Code Issues Proposed changes

Keystone auth: try external auth first

Browse Source 
Also fix noble deps

Closes-bug: #2083831

Signed-off-by: Peter Sabaini <peter.sabaini@canonical.com>
Change-Id: I948b0ba6601463569183743ce6157c913532f793
This commit is contained in:
Peter Sabaini
2024-10-17 13:02:27 +02:00
parent 20299b0627
commit 3a427cd72c
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
osci.yaml
View File

@@ -10,6 +10,7 @@
charm_build_name: ceph-radosgw charm_build_name: ceph-radosgw
build_type: charmcraft build_type: charmcraft
charmcraft_channel: 3.x/beta charmcraft_channel: 3.x/beta
- job: - job:
name: vault-noble-caracal-namespaced name: vault-noble-caracal-namespaced
parent: func-target parent: func-target

2
templates/ceph.conf
View File

@@ -75,7 +75,7 @@ rgw keystone token cache size = {{ cache_size }}
rgw keystone revocation interval = 0 rgw keystone revocation interval = 0
{% endif -%} {% endif -%}
rgw s3 auth use keystone = true rgw s3 auth use keystone = true
rgw s3 auth order = local, external rgw s3 auth order = external, local
{% if namespace_tenants %} {% if namespace_tenants %}
rgw swift account in url = true rgw swift account in url = true
rgw keystone implicit tenants = true rgw keystone implicit tenants = true

11
tox.ini
View File

@@ -22,6 +22,7 @@ skip_install = True
setenv = VIRTUAL_ENV={envdir} setenv = VIRTUAL_ENV={envdir}
PYTHONHASHSEED=0 PYTHONHASHSEED=0
CHARM_DIR={envdir} CHARM_DIR={envdir}
TEST_JUJU3=1
commands = stestr run --slowest {posargs} commands = stestr run --slowest {posargs}
allowlist_externals = allowlist_externals =
charmcraft charmcraft
@@ -33,7 +34,7 @@ passenv =
OS_* OS_*
TEST_* TEST_*
deps = deps =
-c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt} -c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-noble.txt}
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
[testenv:build] [testenv:build]
@@ -52,21 +53,21 @@ commands =
[testenv:py310] [testenv:py310]
basepython = python3.10 basepython = python3.10
deps = deps =
-c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt} -c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-noble.txt}
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
[testenv:py3] [testenv:py3]
basepython = python3 basepython = python3
deps = deps =
-c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt} -c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-noble.txt}
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
[testenv:pep8] [testenv:pep8]
basepython = python3 basepython = python3
deps = deps =
-c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt} -c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-noble.txt}
flake8==3.9.2 flake8==3.9.2
git+https://github.com/juju/charm-tools.git git+https://github.com/juju/charm-tools.git
commands = flake8 {posargs} hooks unit_tests tests actions lib files commands = flake8 {posargs} hooks unit_tests tests actions lib files
@@ -77,7 +78,7 @@ commands = flake8 {posargs} hooks unit_tests tests actions lib files
# https://github.com/openstack/nova/blob/master/tox.ini # https://github.com/openstack/nova/blob/master/tox.ini
basepython = python3 basepython = python3
deps = deps =
-c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt} -c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-noble.txt}
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
setenv = setenv =