diff options
| author | Andrew Butcher <abutcher@redhat.com> | 2016-11-22 13:02:43 -0500 |
|---|---|---|
| committer | Andrew Butcher <abutcher@redhat.com> | 2016-11-22 13:34:04 -0500 |
| commit | 1f9259a0089fa4f1a6895ea69b7bc3a5e3b862b1 (patch) | |
| tree | 2ff6f51d4634a214fc23d654b08119dc316ad190 /roles | |
| parent | 2969e4ede4e6337df0f4f48520b4c38b99d4eb1a (diff) | |
| download | openshift-1f9259a0089fa4f1a6895ea69b7bc3a5e3b862b1.tar.gz openshift-1f9259a0089fa4f1a6895ea69b7bc3a5e3b862b1.tar.bz2 openshift-1f9259a0089fa4f1a6895ea69b7bc3a5e3b862b1.tar.xz openshift-1f9259a0089fa4f1a6895ea69b7bc3a5e3b862b1.zip | |
Reference master binaries when delegating from node hosts which may be containerized.
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_manage_node/tasks/main.yml | 6 | ||||
| -rw-r--r-- | roles/openshift_node_certificates/tasks/main.yml | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/roles/openshift_manage_node/tasks/main.yml b/roles/openshift_manage_node/tasks/main.yml index 88cdd2d89..c06758833 100644 --- a/roles/openshift_manage_node/tasks/main.yml +++ b/roles/openshift_manage_node/tasks/main.yml @@ -47,7 +47,7 @@ - name: Wait for Node Registration command: > - {{ openshift.common.client_binary }} get node {{ openshift.node.nodename }} + {{ hostvars[openshift_master_host].openshift.common.client_binary }} get node {{ openshift.node.nodename }} --config={{ openshift_manage_node_kubeconfig }} -n default register: omd_get_node @@ -60,7 +60,7 @@ - name: Set node schedulability command: > - {{ openshift.common.client_binary }} adm manage-node {{ openshift.node.nodename }} --schedulable={{ 'true' if openshift.node.schedulable | bool else 'false' }} + {{ hostvars[openshift_master_host].openshift.common.client_binary }} adm manage-node {{ openshift.node.nodename }} --schedulable={{ 'true' if openshift.node.schedulable | bool else 'false' }} --config={{ openshift_manage_node_kubeconfig }} -n default when: "'nodename' in openshift.node" @@ -68,7 +68,7 @@ - name: Label nodes command: > - {{ openshift.common.client_binary }} label --overwrite node {{ openshift.node.nodename }} {{ openshift.node.labels | oo_combine_dict }} + {{ hostvars[openshift_master_host].openshift.common.client_binary }} label --overwrite node {{ openshift.node.nodename }} {{ openshift.node.labels | oo_combine_dict }} --config={{ openshift_manage_node_kubeconfig }} -n default when: "'nodename' in openshift.node and 'labels' in openshift.node and openshift.node.labels != {}" 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 |