diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-11-08 17:25:10 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-08 17:25:10 -0500 |
| commit | bf0f8266e91b552ffa815d3a7bcb65f105606438 (patch) | |
| tree | f6bc352be8a8550b2676ffd8cd1e486d3e1c0a37 /roles/openshift_manage_node | |
| parent | a10e68b03db0e318e960a2f13f5f30ccb59b8d09 (diff) | |
| parent | 9e90b0085b1203830164c7ea515e69236f16de76 (diff) | |
| download | openshift-bf0f8266e91b552ffa815d3a7bcb65f105606438.tar.gz openshift-bf0f8266e91b552ffa815d3a7bcb65f105606438.tar.bz2 openshift-bf0f8266e91b552ffa815d3a7bcb65f105606438.tar.xz openshift-bf0f8266e91b552ffa815d3a7bcb65f105606438.zip | |
Merge pull request #2764 from openshift/revert-2751-BZ1388253
Revert "Revert openshift.node.nodename changes"
Diffstat (limited to 'roles/openshift_manage_node')
| -rw-r--r-- | roles/openshift_manage_node/tasks/main.yml | 10 |
1 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 a1f42f8c4..28e4e46e9 100644 --- a/roles/openshift_manage_node/tasks/main.yml +++ b/roles/openshift_manage_node/tasks/main.yml @@ -14,7 +14,7 @@ - name: Wait for Node Registration command: > - {{ openshift.common.client_binary }} get node {{ hostvars[item].openshift.common.hostname }} + {{ openshift.common.client_binary }} get node {{ hostvars[item].openshift.node.nodename }} --config={{ openshift_manage_node_kubeconfig }} -n default register: omd_get_node @@ -26,19 +26,19 @@ - name: Set node schedulability command: > - {{ openshift.common.client_binary }} adm manage-node {{ hostvars[item].openshift.common.hostname | lower }} --schedulable={{ 'true' if hostvars[item].openshift.node.schedulable | bool else 'false' }} + {{ openshift.common.client_binary }} adm manage-node {{ hostvars[item].openshift.node.nodename }} --schedulable={{ 'true' if hostvars[item].openshift.node.schedulable | bool else 'false' }} --config={{ openshift_manage_node_kubeconfig }} -n default with_items: "{{ openshift_nodes }}" - when: hostvars[item].openshift.common.hostname is defined + when: hostvars[item].openshift.node.nodename is defined - name: Label nodes command: > - {{ openshift.common.client_binary }} label --overwrite node {{ hostvars[item].openshift.common.hostname | lower }} {{ hostvars[item].openshift.node.labels | oo_combine_dict }} + {{ openshift.common.client_binary }} label --overwrite node {{ hostvars[item].openshift.node.nodename }} {{ hostvars[item].openshift.node.labels | oo_combine_dict }} --config={{ openshift_manage_node_kubeconfig }} -n default with_items: "{{ openshift_nodes }}" - when: hostvars[item].openshift.common.hostname is defined and 'labels' in hostvars[item].openshift.node and hostvars[item].openshift.node.labels != {} + when: hostvars[item].openshift.node.nodename is defined and 'labels' in hostvars[item].openshift.node and hostvars[item].openshift.node.labels != {} - name: Delete temp directory file: |