From cb692576145b97beadb0116ea50a102a50eb3ef5 Mon Sep 17 00:00:00 2001 From: Brent Eagles Date: Wed, 24 Jul 2019 11:28:10 -0230 Subject: [PATCH] Allow distribution of non-autogenerated certs This patch changes the conditional run of the certs generation from being dependent on the value of generate_certs to whether there are actual certs present. Related-Bug: #1838039 Change-Id: I90bb377c76f51db906de64c134271ec866d11bb5 --- .../roles/octavia-controller-config/tasks/certificate.yml | 2 +- .../roles/octavia-controller-config/tasks/main.yml | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tripleo_ansible/roles/octavia-controller-config/tasks/certificate.yml b/tripleo_ansible/roles/octavia-controller-config/tasks/certificate.yml index d12f2dc16..18a2fd0c8 100644 --- a/tripleo_ansible/roles/octavia-controller-config/tasks/certificate.yml +++ b/tripleo_ansible/roles/octavia-controller-config/tasks/certificate.yml @@ -8,7 +8,7 @@ setype: svirt_sandbox_file_t become: true -- name: Copying key info to octavia +- name: Copying key info to octavia if not already there become: true copy: content: "{{ item.content }}" diff --git a/tripleo_ansible/roles/octavia-controller-config/tasks/main.yml b/tripleo_ansible/roles/octavia-controller-config/tasks/main.yml index 704797beb..fe09918c6 100644 --- a/tripleo_ansible/roles/octavia-controller-config/tasks/main.yml +++ b/tripleo_ansible/roles/octavia-controller-config/tasks/main.yml @@ -6,7 +6,9 @@ - include_tasks: certificate.yml when: - - generate_certs | bool + - private_key_content|length > 0 + - ca_cert_content|length > 0 + - service_pem_content|length > 0 - include_tasks: netport.yml