Browse Source

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

tags/9.6.1
Zuul 2 weeks ago
parent
commit
a7a88099f5

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

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

+ 4
- 1
playbooks/roles/octavia-controller-config/tasks/main.yml View File

@@ -6,7 +6,10 @@
6 6
   - set_fact:
7 7
       node_hostname: "{{ hostname.stdout }}"
8 8
   - include_tasks: certificate.yml
9
-    when: generate_certs
9
+    when:
10
+      - private_key_content|length > 0
11
+      - ca_cert_content|length > 0
12
+      - service_pem_content|length > 0
10 13
   - include_tasks: netport.yml
11 14
   - include_tasks: netinterface.yml
12 15
   - name: making sure octavia common configuration directory exists

Loading…
Cancel
Save