Skip to content

zed: ci-multinode: Add Kolla Ansible TLS config to globals.yml#1255

Merged
Alex-Welsh merged 2 commits into
stackhpc/zedfrom
zed-multinode-tls
Sep 4, 2024
Merged

zed: ci-multinode: Add Kolla Ansible TLS config to globals.yml#1255
Alex-Welsh merged 2 commits into
stackhpc/zedfrom
zed-multinode-tls

Conversation

@markgoddard
Copy link
Copy Markdown
Contributor

Previously we provided an additional file, globals-tls-config.yml, which
would be appended to globals.yml at an appropriate point during
multinode deployment. This could result in a merge conflict, which
cannot be resolved by an automated process such as a GitHub Actions
workflow.

This change adds the TLS config to globals.yml conditionally, based on
whether internal TLS is enabled.

We are not removing globals-tls-config.yml for now, since it is used in
the terraform-kayobe-multinode repo as a proxy for internal TLS support.
The file has already been removed in the Antelope branch.

Previously we provided an additional file, globals-tls-config.yml, which
would be appended to globals.yml at an appropriate point during
multinode deployment. This could result in a merge conflict, which
cannot be resolved by an automated process such as a GitHub Actions
workflow.

This change adds the TLS config to globals.yml conditionally, based on
whether internal TLS is enabled.

We are not removing globals-tls-config.yml for now, since it is used in
the terraform-kayobe-multinode repo as a proxy for internal TLS support.
The file has already been removed in the Antelope branch.
@markgoddard markgoddard requested a review from a team as a code owner September 2, 2024 15:41
@markgoddard markgoddard self-assigned this Sep 2, 2024
@markgoddard markgoddard changed the base branch from stackhpc/2023.1 to stackhpc/zed September 2, 2024 15:41
@markgoddard markgoddard changed the title ci-multinode: Add Kolla Ansible TLS config to globals.yml zed: ci-multinode: Add Kolla Ansible TLS config to globals.yml Sep 2, 2024
@markgoddard markgoddard closed this Sep 4, 2024
@markgoddard markgoddard reopened this Sep 4, 2024
@markgoddard
Copy link
Copy Markdown
Contributor Author

CI now passing.

@Alex-Welsh Alex-Welsh merged commit 61070bb into stackhpc/zed Sep 4, 2024
@Alex-Welsh Alex-Welsh deleted the zed-multinode-tls branch September 4, 2024 14:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants