Merge "Allow distribution of non-autogenerated certs" into stable/rocky
This commit is contained in:
commit
a7a88099f5
|
@ -2,7 +2,7 @@
|
||||||
- name: making sure octavia worker configuration directory exists
|
- name: making sure octavia worker configuration directory exists
|
||||||
file: path="{{ octavia_confd_prefix }}{{ ca_private_key_path | dirname }}" state=directory
|
file: path="{{ octavia_confd_prefix }}{{ ca_private_key_path | dirname }}" state=directory
|
||||||
become: true
|
become: true
|
||||||
- name: Copying ca private key to octavia
|
- name: Copying key info to octavia if not already there
|
||||||
become: true
|
become: true
|
||||||
copy: content="{{ private_key_content }}" dest="{{ octavia_confd_prefix }}{{ ca_private_key_path }}"
|
copy: content="{{ private_key_content }}" dest="{{ octavia_confd_prefix }}{{ ca_private_key_path }}"
|
||||||
- name: copying ca certificate to octavia
|
- name: copying ca certificate to octavia
|
||||||
|
|
|
@ -6,7 +6,10 @@
|
||||||
- set_fact:
|
- set_fact:
|
||||||
node_hostname: "{{ hostname.stdout }}"
|
node_hostname: "{{ hostname.stdout }}"
|
||||||
- include_tasks: certificate.yml
|
- include_tasks: certificate.yml
|
||||||
when: generate_certs
|
when:
|
||||||
|
- private_key_content|length > 0
|
||||||
|
- ca_cert_content|length > 0
|
||||||
|
- service_pem_content|length > 0
|
||||||
- include_tasks: netport.yml
|
- include_tasks: netport.yml
|
||||||
- include_tasks: netinterface.yml
|
- include_tasks: netinterface.yml
|
||||||
- name: making sure octavia common configuration directory exists
|
- name: making sure octavia common configuration directory exists
|
||||||
|
|
Loading…
Reference in New Issue