Bug 1511044- Slurp the etcd certs instead of using the lookup

openshift · Nov 8, 2017 · 40aa937 · 40aa937
1 parent 196891f
commit 40aa937
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/roles/ansible_service_broker/tasks/generate_certs.yml b/roles/ansible_service_broker/tasks/generate_certs.yml
@@ -29,7 +29,16 @@
   - set_fact:
       ansible_service_broker_certs_dir: "{{ openshift.common.config_base }}/ansible-service-broker"
 
+- name: Read in certs for etcd
+  slurp:
+    src: '{{ ansible_service_broker_certs_dir }}/{{ item }}'
+  register: asb_etcd_certs
+  with_items:
+  - cert.pem
+  - client.pem
+  - client.key
+
 - set_fact:
-    etcd_ca_cert: "{{ lookup('file', '{{ ansible_service_broker_certs_dir }}/cert.pem') }}"
-    etcd_client_cert: "{{ lookup('file', '{{ ansible_service_broker_certs_dir }}/client.pem') }}"
-    etcd_client_key: "{{ lookup('file', '{{ ansible_service_broker_certs_dir }}/client.key') }}"
+    etcd_ca_cert: "{{ asb_etcd_certs.results.0.content | b64decode }}"
+    etcd_client_cert: "{{ asb_etcd_certs.results.1.content | b64decode }}"
+    etcd_client_key: "{{ asb_etcd_certs.results.2.content | b64decode }}"