summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-11-08 12:52:25 -0500
committerGitHub <noreply@github.com>2017-11-08 12:52:25 -0500
commit2ccdd880216bb88afe92a78d24a01f81ab5d6e1b (patch)
treecc990316c4eaa7f06f713c7b46bbe47bc4a2d05b /roles
parent119bba8c06fe34b8ae4102cab529a74452dbf85c (diff)
parent40aa9376dbb05b531dde8357adc1292055d199e3 (diff)
downloadopenshift-2ccdd880216bb88afe92a78d24a01f81ab5d6e1b.tar.gz
openshift-2ccdd880216bb88afe92a78d24a01f81ab5d6e1b.tar.bz2
openshift-2ccdd880216bb88afe92a78d24a01f81ab5d6e1b.tar.xz
openshift-2ccdd880216bb88afe92a78d24a01f81ab5d6e1b.zip
Merge pull request #6059 from fabianvf/1511044-fix-asb-cert-lookup
Bug 1511044- Slurp the etcd certs instead of using the lookup
Diffstat (limited to 'roles')
-rw-r--r--roles/ansible_service_broker/tasks/generate_certs.yml15
1 files changed, 12 insertions, 3 deletions
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 }}"