From 40aa9376dbb05b531dde8357adc1292055d199e3 Mon Sep 17 00:00:00 2001 From: Fabian von Feilitzsch Date: Wed, 8 Nov 2017 10:23:35 -0500 Subject: Bug 1511044- Slurp the etcd certs instead of using the lookup --- roles/ansible_service_broker/tasks/generate_certs.yml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'roles/ansible_service_broker') diff --git a/roles/ansible_service_broker/tasks/generate_certs.yml b/roles/ansible_service_broker/tasks/generate_certs.yml index 85e67e00c..3da896548 100644 --- 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 }}" -- cgit v1.2.1