Separate kustomization from image creation and fix HSM password loading for adoption #3579
+67
−45
Conversation
This file contains hidden or 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
This commit separates the Barbican Proteccio playbook into two parts to support adoption scenarios where image creation and kustomization need to happen at different times: - barbican-prepare-proteccio.yml: Creates custom Barbican images with HSM client and sets up OpenShift secrets - barbican-enable-proteccio.yml: Applies kustomization to configure Barbican to use Proteccio HSM Additionally, this adds support for loading the HSM password from a Zuul secret file (/var/tmp/qe-secrets/proteccio_pin.yaml) when the cifmw_hsm_password variable is not already defined. This file is created by the qe-creds-crc.yaml pre-run playbook in the components-integration-config repository. This change is based on PR openstack-k8s-operators#3543 by Ade Lee, with the addition of the HSM password file loading logic. Jira: OSPRH-20112 Signed-off-by: Mauricio Harley <mharley@redhat.com>
Contributor
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Playbook Separation (based on PR #3543)
When performing Barbican adoption from OSP 17.1 to RHOSO 18, the image
creation and kustomization need to happen at different times. This PR
separates the logic into:
HSM client software and sets up OpenShift secrets (certificates and login)
the Barbican control plane to use Proteccio HSM
HSM Password Loading Fix
Added logic to load
cifmw_hsm_passwordfrom the Zuul secret file at/var/tmp/qe-secrets/proteccio_pin.yamlwhen the variable is not alreadydefined. This file is created by the
qe-creds-crc.yamlpre-run playbookin the
components-integration-configrepository.This fixes the issue where the playbook would fail with:
'cifmw_hsm_password' is undefined