openstack
/
tripleo-common
Code Issues Proposed changes

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

This commit is contained in:
Zuul 2019-08-30 09:35:41 +00:00 committed by Gerrit Code Review
parent 8adc39b62d 16fb6c247b
commit bb10b10efb
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

@ -6,7 +6,7 @@
selevel: s0 selevel: s0
setype: svirt_sandbox_file_t setype: svirt_sandbox_file_t
become: true become: true
- name: Copying key info to octavia - name: Copying key info to octaviai if not already there
become: true become: true
copy: copy:
content: "{{ item.content }}" content: "{{ item.content }}"

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

@ -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