-
Notifications
You must be signed in to change notification settings - Fork 21
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
INFRA-839 Add playbooks, config & docs for enabling Pulp tls with vault #1427
Open
technowhizz
wants to merge
2
commits into
stackhpc/2024.1
Choose a base branch
from
update-vault-docs-dec-2024
base: stackhpc/2024.1
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
--- | ||
- name: Copy CA certificate and update trust | ||
hosts: overcloud:seed:seed-hypervisor | ||
become: true | ||
vars: | ||
cert_path: "{{ kayobe_env_config_path }}/vault/OS-TLS-ROOT.pem" | ||
|
||
tasks: | ||
- name: Copy certificate on RedHat family systems (Rocky, RHEL, CentOS) | ||
copy: | ||
src: "{{ cert_path }}" | ||
dest: "/etc/pki/ca-trust/source/anchors/OS-TLS-ROOT.pem" | ||
mode: "0644" | ||
when: ansible_facts.os_family == 'RedHat' | ||
|
||
- name: Update CA trust on RedHat family systems | ||
command: "update-ca-trust" | ||
when: ansible_facts.os_family == 'RedHat' | ||
|
||
- name: Copy certificate on Debian family systems (Ubuntu, Debian) | ||
copy: | ||
src: "{{ cert_path }}" | ||
dest: "/usr/local/share/ca-certificates/OS-TLS-ROOT.crt" | ||
mode: "0644" | ||
when: ansible_facts.os_family == 'Debian' | ||
|
||
- name: Update CA trust on Debian family systems | ||
command: "update-ca-certificates" | ||
when: ansible_facts.os_family == 'Debian' |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,53 @@ | ||
--- | ||
- name: Generate TLS certificate for pulp | ||
hosts: controllers | ||
run_once: true | ||
vars: | ||
vault_api_addr: "https://{{ internal_net_name | net_ip(groups['controllers'][0]) }}:8200" | ||
vault_intermediate_ca_name: "OS-TLS-INT" | ||
tasks: | ||
- name: Include Vault keys | ||
include_vars: | ||
file: "{{ kayobe_env_config_path }}/vault/overcloud-vault-keys.json" | ||
name: vault_keys | ||
|
||
- name: Issue a certificate for pulp TLS | ||
hashivault_pki_cert_issue: | ||
url: "{{ vault_api_addr }}" | ||
ca_cert: "{{ '/etc/pki/tls/certs/ca-bundle.crt' if ansible_facts.os_family == 'RedHat' else '/usr/local/share/ca-certificates/OS-TLS-ROOT.crt' }}" | ||
token: "{{ vault_keys.root_token }}" | ||
mount_point: "{{ vault_intermediate_ca_name }}" | ||
role: "{{ overcloud_vault_pki_internal_tls_role_name }}" | ||
common_name: "" | ||
verify: false | ||
extra_params: | ||
ip_sans: "{{ lookup('vars', admin_oc_net_name ~ '_ips')[groups.seed.0] }}" | ||
register: pulp_cert | ||
environment: | ||
https_proxy: '' | ||
|
||
- name: Ensure pulp certificates directory exists | ||
file: | ||
path: "{{ kayobe_env_config_path }}/pulp/certificates" | ||
state: directory | ||
delegate_to: localhost | ||
|
||
- name: Copy pulp TLS certificate (including intermediate) | ||
no_log: true | ||
copy: | ||
dest: "{{ kayobe_env_config_path }}/pulp/certificates/pulp.crt" | ||
content: | | ||
{{ pulp_cert.data.certificate }} | ||
{{ pulp_cert.data.issuing_ca }} | ||
mode: 0600 | ||
delegate_to: localhost | ||
|
||
- name: Copy pulp private key | ||
no_log: true | ||
copy: | ||
dest: "{{ kayobe_env_config_path }}/pulp/certificates/pulp.key" | ||
content: "{{ pulp_cert.data.private_key }}" | ||
mode: 0600 | ||
delegate_to: localhost | ||
|
||
- import_playbook: copy-ca-to-hosts.yml |
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
--- | ||
features: | ||
- | | ||
Playbooks have been added to allow for the configuration of Pulp with TLS | ||
using certificates generated from vault. Instructions have been added to | ||
the docs. |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Only thing to point out here is that we have a bootstrapping issue where we have to bring the controllers up and deploy vault before generating the certs. You could use the vault on the seed to generate the certificate for pulp instead, but is it better to always use the overcloud vault? What do people think?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If we want to use vault from the seed (which might make more sense, since this is being deployed on the seed) then we'll need a second intermediate CA?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It would make sense to have TLS for Pulp before we need to use Pulp at all, so even before Bifrost. So +1 to not relying on the overcloud vault
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should we do that as a part 2? and perhaps call this 'Deploying pulp with TLS on an existing cloud?'