diff options
| author | Jason DeTiberus <detiber@gmail.com> | 2016-11-22 14:38:08 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-22 14:38:08 -0500 |
| commit | fb357a2c39bb06624fd387fc490947163bbf3e0b (patch) | |
| tree | f993ce69de6b5fdf8a7d66ae1f309192fafe5839 /roles/openshift_node_certificates | |
| parent | 11594f847088c4428bc2734b181b63766f895c31 (diff) | |
| parent | 1f9259a0089fa4f1a6895ea69b7bc3a5e3b862b1 (diff) | |
| download | openshift-fb357a2c39bb06624fd387fc490947163bbf3e0b.tar.gz openshift-fb357a2c39bb06624fd387fc490947163bbf3e0b.tar.bz2 openshift-fb357a2c39bb06624fd387fc490947163bbf3e0b.tar.xz openshift-fb357a2c39bb06624fd387fc490947163bbf3e0b.zip | |
Merge pull request #2845 from abutcher/fix-mixed-env
Fix issues encountered in mixed environments
Diffstat (limited to 'roles/openshift_node_certificates')
| -rw-r--r-- | roles/openshift_node_certificates/tasks/main.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_node_certificates/tasks/main.yml b/roles/openshift_node_certificates/tasks/main.yml index 69bcd3668..35f84c2cf 100644 --- a/roles/openshift_node_certificates/tasks/main.yml +++ b/roles/openshift_node_certificates/tasks/main.yml @@ -44,7 +44,7 @@ - name: Generate the node client config command: > - {{ openshift.common.client_binary }} adm create-api-client-config + {{ hostvars[openshift_ca_host].openshift.common.client_binary }} adm create-api-client-config {% for named_ca_certificate in hostvars[openshift_ca_host].openshift.master.named_certificates | default([]) | oo_collect('cafile') %} --certificate-authority {{ named_ca_certificate }} {% endfor %} @@ -63,7 +63,7 @@ - name: Generate the node server certificate command: > - {{ openshift.common.client_binary }} adm ca create-server-cert + {{ hostvars[openshift_ca_host].openshift.common.client_binary }} adm ca create-server-cert --cert={{ openshift_node_generated_config_dir }}/server.crt --key={{ openshift_generated_configs_dir }}/node-{{ openshift.common.hostname }}/server.key --overwrite=true |