openstack
/
tripleo-common
Code Issues Proposed changes

Merge "Allow distribution of non-autogenerated certs" into stable/queens

This commit is contained in:
Zuul 2019-10-12 04:41:21 +00:00 committed by Gerrit Code Review
parent 1048a6f53d 16232417e1
commit 8233dca93a
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
playbooks/roles/octavia-controller-config/tasks/certificate.yml
View File

@ -2,7 +2,7 @@
- name: making sure octavia worker configuration directory exists
file: path="{{ octavia_confd_prefix }}{{ ca_private_key_path | dirname }}" state=directory
become: true
- name: Copying ca private key to octavia
- name: Copying key info to octavia if not already there
become: true
copy: content="{{ private_key_content }}" dest="{{ octavia_confd_prefix }}{{ ca_private_key_path }}"
- name: copying ca certificate to octavia

5
playbooks/roles/octavia-controller-config/tasks/main.yml
View File

@ -6,7 +6,10 @@
- set_fact:
node_hostname: "{{ hostname.stdout }}"
- 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: netinterface.yml
- name: making sure octavia common configuration directory exists