Add hashi_vault pki backend support
This patch defines necessary variables for the 'hashi_vault' pki backend which is the alternative to the default 'standalone' backend. Additionally, it: - changes the format of `cloudkitty_pki_san` to the new one changed in [1] - passes `pki_default_backend` when trigerring PKI role so its aware of the default backend in case it's not explicitly specified in the cert definition. - adopts this role to the recent changes in PKI role [2][3][4] [1] https://review.opendev.org/c/openstack/openstack-ansible/+/948886 [2]fc7db02074[3]7cff89ee71[4]f03bcc19d5Depends-On: https://review.opendev.org/c/openstack/openstack-ansible-os_gnocchi/+/979877 Change-Id: I476802601ab5cd1fb1e8ece94fb5a5b523f12d86 Signed-off-by: Damian Dabrowski <damian.dabrowski@cleura.com>
This commit is contained in:
1 parent
7816a20660
commit
16074a5889
2 files changed
+16
-9
No files matched your search
+14
-8
@@ -243,12 +243,14 @@ cloudkitty_pki_keys_path: "{{ cloudkitty_pki_dir ~ '/certs/private/' }}"
|
||||
cloudkitty_pki_certs_path: "{{ cloudkitty_pki_dir ~ '/certs/certs/' }}"
|
||||
cloudkitty_pki_intermediate_cert_name: "{{ openstack_pki_service_intermediate_cert_name | default('ExampleCorpIntermediate') }}"
|
||||
cloudkitty_pki_regen_cert: ""
|
||||
cloudkitty_pki_san: "{{ openstack_pki_san | default('DNS:' ~ ansible_facts['hostname'] ~ ',IP:' ~ management_address) }}"
|
||||
cloudkitty_pki_san: "{{ openstack_pki_san | default({'dns': [ansible_facts['hostname']], 'ip': [management_address]}) }}"
|
||||
cloudkitty_pki_backend: "{{ openstack_pki_backend | default('standalone') }}"
|
||||
cloudkitty_pki_certificates:
|
||||
- name: "cloudkitty_{{ ansible_facts['hostname'] }}"
|
||||
provider: ownca
|
||||
cn: "{{ ansible_facts['hostname'] }}"
|
||||
san: "{{ cloudkitty_pki_san }}"
|
||||
# standalone backend only
|
||||
provider: ownca
|
||||
signed_by: "{{ cloudkitty_pki_intermediate_cert_name }}"
|
||||
|
||||
# cloudkitty destination files for SSL certificates
|
||||
@@ -257,17 +259,21 @@ cloudkitty_ssl_key: /etc/cloudkitty/cloudkitty.key
|
||||
|
||||
# Installation details for SSL certificates
|
||||
cloudkitty_pki_install_certificates:
|
||||
- src: "{{ cloudkitty_user_ssl_cert | default(cloudkitty_pki_certs_path ~ 'cloudkitty_' ~ ansible_facts['hostname'] ~ '-chain.crt') }}"
|
||||
- name: "cloudkitty_{{ ansible_facts['hostname'] }}"
|
||||
type: "certificate_chain"
|
||||
dest: "{{ cloudkitty_ssl_cert }}"
|
||||
owner: "{{ cloudkitty_system_user_name }}"
|
||||
group: "{{ cloudkitty_system_user_name }}"
|
||||
mode: "0644"
|
||||
- src: "{{ cloudkitty_user_ssl_key | default(cloudkitty_pki_keys_path ~ 'cloudkitty_' ~ ansible_facts['hostname'] ~ '.key.pem') }}"
|
||||
# standalone backend only
|
||||
src: "{{ cloudkitty_user_ssl_cert | default(cloudkitty_pki_certs_path ~ 'cloudkitty_' ~ ansible_facts['hostname'] ~ '-chain.crt') }}"
|
||||
- name: "cloudkitty_{{ ansible_facts['hostname'] }}"
|
||||
type: "private_key"
|
||||
dest: "{{ cloudkitty_ssl_key }}"
|
||||
owner: "{{ cloudkitty_system_user_name }}"
|
||||
group: "{{ cloudkitty_system_user_name }}"
|
||||
mode: "0600"
|
||||
# standalone backend only
|
||||
src: "{{ cloudkitty_user_ssl_key | default(cloudkitty_pki_keys_path ~ 'cloudkitty_' ~ ansible_facts['hostname'] ~ '.key.pem') }}"
|
||||
|
||||
# Define user-provided SSL certificates
|
||||
# cloudkitty_user_ssl_cert: <path to cert on ansible deployment host>
|
||||
# cloudkitty_user_ssl_key: <path to cert on ansible deployment host>
|
||||
cloudkitty_user_ssl_cert: ""
|
||||
cloudkitty_user_ssl_key: ""
|
||||
+2
-1
@@ -105,9 +105,10 @@
|
||||
- cloudkitty-config
|
||||
- pki
|
||||
vars:
|
||||
pki_backend: "{{ cloudkitty_pki_backend }}"
|
||||
pki_setup_host: "{{ cloudkitty_pki_setup_host }}"
|
||||
pki_dir: "{{ cloudkitty_pki_dir }}"
|
||||
pki_create_certificates: "{{ cloudkitty_user_ssl_cert is not defined and cloudkitty_user_ssl_key is not defined }}"
|
||||
pki_create_certificates: "{{ cloudkitty_user_ssl_cert | length == 0 and cloudkitty_user_ssl_key | length == 0 }}"
|
||||
pki_regen_cert: "{{ cloudkitty_pki_regen_cert }}"
|
||||
pki_certificates: "{{ cloudkitty_pki_certificates }}"
|
||||
pki_install_certificates: "{{ cloudkitty_pki_install_certificates }}"
|
||||
|
||||
Reference in new issue
Block a user