Skip to content

Commit 59fcd1a

Browse files
committed
Add FQCNs
1 parent 1a64fe4 commit 59fcd1a

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

etc/kayobe/ansible/copy-ca-to-hosts.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,23 @@
77

88
tasks:
99
- name: Copy certificate on RedHat family systems (Rocky, RHEL, CentOS)
10-
copy:
10+
ansible.builtin.copy:
1111
src: "{{ cert_path }}"
1212
dest: "/etc/pki/ca-trust/source/anchors/OS-TLS-ROOT.pem"
1313
mode: "0644"
1414
when: ansible_facts.os_family == 'RedHat'
1515

1616
- name: Update CA trust on RedHat family systems
17-
command: "update-ca-trust"
17+
ansible.builtin.command: "update-ca-trust"
1818
when: ansible_facts.os_family == 'RedHat'
1919

2020
- name: Copy certificate on Debian family systems (Ubuntu, Debian)
21-
copy:
21+
ansible.builtin.copy:
2222
src: "{{ cert_path }}"
2323
dest: "/usr/local/share/ca-certificates/OS-TLS-ROOT.crt"
2424
mode: "0644"
2525
when: ansible_facts.os_family == 'Debian'
2626

2727
- name: Update CA trust on Debian family systems
28-
command: "update-ca-certificates"
28+
ansible.builtin.command: "update-ca-certificates"
2929
when: ansible_facts.os_family == 'Debian'

etc/kayobe/ansible/vault-generate-pulp-tls.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
vault_intermediate_ca_name: "OS-TLS-INT"
88
tasks:
99
- name: Include Vault keys
10-
include_vars:
10+
ansible.builtin.include_vars:
1111
file: "{{ kayobe_env_config_path }}/vault/overcloud-vault-keys.json"
1212
name: vault_keys
1313

14-
- name: Issue a certificate for pulp TLS
14+
- name: Issue a certificate for pulp TLS # noqa: fqcn
1515
hashivault_pki_cert_issue:
1616
url: "{{ vault_api_addr }}"
1717
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' }}"
@@ -27,14 +27,14 @@
2727
https_proxy: ''
2828

2929
- name: Ensure pulp certificates directory exists
30-
file:
30+
ansible.builtin.file:
3131
path: "{{ kayobe_env_config_path }}/pulp/certificates"
3232
state: directory
3333
delegate_to: localhost
3434

3535
- name: Copy pulp TLS certificate (including intermediate)
3636
no_log: true
37-
copy:
37+
ansible.builtin.copy:
3838
dest: "{{ kayobe_env_config_path }}/pulp/certificates/pulp.crt"
3939
content: |
4040
{{ pulp_cert.data.certificate }}
@@ -44,10 +44,11 @@
4444

4545
- name: Copy pulp private key
4646
no_log: true
47-
copy:
47+
ansible.builtin.copy:
4848
dest: "{{ kayobe_env_config_path }}/pulp/certificates/pulp.key"
4949
content: "{{ pulp_cert.data.private_key }}"
5050
mode: 0600
5151
delegate_to: localhost
5252

53-
- import_playbook: copy-ca-to-hosts.yml
53+
- name: Copy CA to hosts playbook
54+
import_playbook: copy-ca-to-hosts.yml

0 commit comments

Comments
 (0)