summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-02-08 13:08:51 -0500
committerGitHub <noreply@github.com>2017-02-08 13:08:51 -0500
commit405bd70f0f94f4a45cb4b7cfc7634a82928b6b2e (patch)
tree2cc798b9885424566deeca0493eb31aa7f916709
parentad462163de94d535b9bff9764d1016213f690506 (diff)
parente2ad5c450ef23a7756ee21737c6fe92b0742c845 (diff)
downloadopenshift-405bd70f0f94f4a45cb4b7cfc7634a82928b6b2e.tar.gz
openshift-405bd70f0f94f4a45cb4b7cfc7634a82928b6b2e.tar.bz2
openshift-405bd70f0f94f4a45cb4b7cfc7634a82928b6b2e.tar.xz
openshift-405bd70f0f94f4a45cb4b7cfc7634a82928b6b2e.zip
Merge pull request #3278 from abutcher/mixed-env
Bug 1364160 - facts collection for openshift.common.admin_binary does not seem to work in mixed environments
-rw-r--r--roles/openshift_ca/tasks/main.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_ca/tasks/main.yml b/roles/openshift_ca/tasks/main.yml
index 4efc77f11..ae3ad31c3 100644
--- a/roles/openshift_ca/tasks/main.yml
+++ b/roles/openshift_ca/tasks/main.yml
@@ -87,7 +87,7 @@
# This should NOT replace the CA due to --overwrite=false when a CA already exists.
- name: Create the master certificates if they do not already exist
command: >
- {{ openshift.common.client_binary }} adm create-master-certs
+ {{ hostvars[openshift_ca_host].openshift.common.client_binary }} adm create-master-certs
{% for named_ca_certificate in openshift.master.named_certificates | default([]) | oo_collect('cafile') %}
--certificate-authority {{ named_ca_certificate }}
{% endfor %}