IndentityServiceContext app data fixes #746
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The IdentityServiceContext was recently updated to add the application data bag. Unfortunately, they keystone charm uses *both* the regular relation data primarily, but the updates for endpoints are on both the application database and the regular relation data. The IdentityServiceContext used the app data bag exclusively if there were any keys available, which leads to it ignoring the existing relation data entirely; this results in 'identity relation not ready' with missing data items. This patch changes the functionality of the IdentityServiceContext so that it preferentially selects keys from the application data bag *unless* they are None, in which case it tries for those keys on the existing relation data. e.g. it will stitch the two relations together with the app data bag taking priority. This allows the (e.g.) nova-cloud-controller charm to correctly access the identity relation data and form a complete context.
javacruft
reviewed
Nov 3, 2022
javacruft
approved these changes
Nov 3, 2022
openstack-mirroring
pushed a commit
to openstack/charm-nova-cloud-controller
that referenced
this pull request
Nov 7, 2022
The IdentityServiceContext was recently updated to add the application data bag. Unfortunately, they keystone charm uses both the regular relation data primarily, but the updates for endpoints are on both the application database and the regular relation data. The IdentityServiceContext used the app data bag exclusively if there were any keys available, which leads to it ignoring the existing relation data entirely; this results in 'identity relation not ready' with missing data items. charm-helpers is patched at [1] to solve the issue and this is a charm-helpers sync that includes that patch. This changes the functionality of the IdentityServiceContext so that it preferentially selects keys from the application data bag unless they are None, in which case it tries for those keys on the existing relation data. e.g. it will stitch the two relations together with the app data bag taking priority. This allows the nova-cloud-controller charm to correctly access the identity relation data and form a complete context. [1] juju/charm-helpers#746 Change-Id: Ic868213c6bb42bc2a28ad25a2f7344a28ab9f04d
openstack-mirroring
pushed a commit
to openstack/openstack
that referenced
this pull request
Nov 7, 2022
* Update charm-nova-cloud-controller from branch 'master'
to 1d06b80c8dfb5ce4aa5fa74ac444d6af961053b0
- ch-sync: IndentityServiceContext app data fixes
The IdentityServiceContext was recently updated to add the application
data bag. Unfortunately, they keystone charm uses both the regular
relation data primarily, but the updates for endpoints are on both the
application database and the regular relation data. The
IdentityServiceContext used the app data bag exclusively if there were
any keys available, which leads to it ignoring the existing relation
data entirely; this results in 'identity relation not ready' with
missing data items.
charm-helpers is patched at [1] to solve the issue and this is a
charm-helpers sync that includes that patch. This changes the
functionality of the IdentityServiceContext so that it preferentially
selects keys from the application data bag unless they are None, in
which case it tries for those keys on the existing relation data. e.g.
it will stitch the two relations together with the app data bag taking
priority. This allows the nova-cloud-controller charm to correctly
access the identity relation data and form a complete context.
[1] juju/charm-helpers#746
Change-Id: Ic868213c6bb42bc2a28ad25a2f7344a28ab9f04d
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The IdentityServiceContext was recently updated to add the application data bag. Unfortunately, they keystone charm uses both the regular relation data primarily, but the updates for endpoints are on both the application database and the regular relation data. The IdentityServiceContext used the app data bag exclusively if there were any keys available, which leads to it ignoring the existing relation data entirely; this results in 'identity relation not ready' with missing data items.
This patch changes the functionality of the IdentityServiceContext so that it preferentially selects keys from the application data bag unless they are None, in which case it tries for those keys on the existing relation data. e.g. it will stitch the two relations together with the app data bag taking priority. This allows the (e.g.) nova-cloud-controller charm to correctly access the identity relation data and form a complete context.