summaryrefslogtreecommitdiffstats
path: root/roles/openshift_node_certificates
diff options
context:
space:
mode:
authorDevan Goodwin <dgoodwin@redhat.com>2016-10-18 09:39:21 -0300
committerDevan Goodwin <dgoodwin@redhat.com>2016-10-19 10:00:30 -0300
commit3ea0166aa301990d4f95fdb1c48557e710aa0b05 (patch)
tree233baede8c077ce2d7225328121ce6155af31cb7 /roles/openshift_node_certificates
parent9fa3c6c98420e4e340507193fd3ad80c15e5c19e (diff)
downloadopenshift-3ea0166aa301990d4f95fdb1c48557e710aa0b05.tar.gz
openshift-3ea0166aa301990d4f95fdb1c48557e710aa0b05.tar.bz2
openshift-3ea0166aa301990d4f95fdb1c48557e710aa0b05.tar.xz
openshift-3ea0166aa301990d4f95fdb1c48557e710aa0b05.zip
Switch from "oadm" to "oc adm" and fix bug in binary sync.
Found bug syncing binaries to containerized hosts where if a symlink was pre-existing, but pointing to the wrong destination, it would not be corrected. Switched to using oc adm instead of oadm.
Diffstat (limited to 'roles/openshift_node_certificates')
-rw-r--r--roles/openshift_node_certificates/tasks/main.yml4
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 80ab4bb1d..69bcd3668 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.admin_binary }} create-api-client-config
+ {{ 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.admin_binary }} ca create-server-cert
+ {{ 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