Skip to content

Commit

Permalink
[yoga] Ensure get_requests_for_local_unit doesn't fail on incomplete …
Browse files Browse the repository at this point in the history
…relation

This is a rebuild/make sync for charms to pickup the fix in charmhelpers to fix
any inadvertant accesses of ['ca'] in the relation data before it is available
from vault in the certificates relation.  Fix in charmhelpers is in [1].

[1] juju/charm-helpers#827
Closes-Bug: #2028683

Change-Id: I7fde216402a15e0512361dcb89331f5cedd63563
  • Loading branch information
ajkavanagh committed Aug 17, 2023
1 parent 2e0b9d2 commit 066b54e
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 3 deletions.
2 changes: 1 addition & 1 deletion rebuild
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# when dependencies of the charm change,
# but nothing in the charm needs to.
# simply change the uuid to something new
53a26c76-1178-11ec-82fd-9325926a4dcf
acc03b90-3b6e-11ee-b46b-b7adc999a595
8 changes: 7 additions & 1 deletion src/build.lock
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,12 @@
"vcs": null,
"version": "21.10.1"
},
{
"type": "python_module",
"package": "Cython",
"vcs": null,
"version": "0.29.36"
},
{
"type": "python_module",
"package": "PyYAML",
Expand Down Expand Up @@ -243,4 +249,4 @@
"version": "1.16.0"
}
]
}
}
1 change: 1 addition & 0 deletions test-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# choices of *requirements.txt files for OpenStack Charms:
# https://github.com/openstack-charmers/release-tools
#
#cython==0.29.36
pyparsing<3.0.0 # aodhclient is pinned in zaza and needs pyparsing < 3.0.0, but cffi also needs it, so pin here.
cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35.
setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
Expand Down
3 changes: 2 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,8 @@ commands = stestr run --slowest {posargs}
[testenv:pep8]
basepython = python3
deps = flake8==3.9.2
charm-tools==2.8.3
PyYAML==6.0.1
charm-tools==2.8.6
commands = flake8 {posargs} src unit_tests

[testenv:func-target]
Expand Down

0 comments on commit 066b54e

Please sign in to comment.