Browse Source

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

tags/10.8.1
Zuul 3 weeks ago
parent
commit
bb10b10efb

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

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

+ 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