Keystone auth: try external auth first

Also fix noble deps Closes-bug: #2083831 Signed-off-by: Peter Sabaini <[email protected]> Change-Id: I948b0ba6601463569183743ce6157c913532f793
openstack · Oct 17, 2024 · 3a427cd · 3a427cd
1 parent 20299b0
commit 3a427cd
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/osci.yaml b/osci.yaml
@@ -10,6 +10,7 @@
       charm_build_name: ceph-radosgw
       build_type: charmcraft
       charmcraft_channel: 3.x/beta
+
 - job:
     name: vault-noble-caracal-namespaced
     parent: func-target

diff --git a/templates/ceph.conf b/templates/ceph.conf
@@ -75,7 +75,7 @@ rgw keystone token cache size = {{ cache_size }}
 rgw keystone revocation interval = 0
 {% endif -%}
 rgw s3 auth use keystone = true
-rgw s3 auth order = local, external
+rgw s3 auth order = external, local
 {% if namespace_tenants %}
 rgw swift account in url = true
 rgw keystone implicit tenants = true

diff --git a/tox.ini b/tox.ini
@@ -22,6 +22,7 @@ skip_install = True
 setenv = VIRTUAL_ENV={envdir}
          PYTHONHASHSEED=0
          CHARM_DIR={envdir}
+         TEST_JUJU3=1
 commands = stestr run --slowest {posargs}
 allowlist_externals =
     charmcraft
@@ -33,7 +34,7 @@ passenv =
     OS_*
     TEST_*
 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
 
 [testenv:build]
@@ -52,21 +53,21 @@ commands =
 [testenv:py310]
 basepython = python3.10
 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}/test-requirements.txt
 
 [testenv:py3]
 basepython = python3
 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}/test-requirements.txt
 
 [testenv:pep8]
 basepython = python3
 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
     git+https://github.com/juju/charm-tools.git
 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
 basepython = python3
 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}/test-requirements.txt
 setenv =