diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-08-16 14:59:14 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-16 14:59:14 -0400 |
| commit | f2f81ea3aff7e52716a7fa75b131e008f84cfa90 (patch) | |
| tree | be6834cec2f7184222b037dd590f64011a947c55 /roles | |
| parent | bdf12ce1512ec5467cf668b0a7c8553a4dab92d1 (diff) | |
| parent | 75df5713bc1b1d3cf454a6975e2ed8eea528a8a3 (diff) | |
| download | openshift-f2f81ea3aff7e52716a7fa75b131e008f84cfa90.tar.gz openshift-f2f81ea3aff7e52716a7fa75b131e008f84cfa90.tar.bz2 openshift-f2f81ea3aff7e52716a7fa75b131e008f84cfa90.tar.xz openshift-f2f81ea3aff7e52716a7fa75b131e008f84cfa90.zip | |
Merge pull request #2220 from jkhelil/fix_key_error_when_ssh_failing
fixing openshift key error in case of node failure during run (ssh is…
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_manage_node/tasks/main.yml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/roles/openshift_manage_node/tasks/main.yml b/roles/openshift_manage_node/tasks/main.yml index 291cdbbb5..5abac32cd 100644 --- a/roles/openshift_manage_node/tasks/main.yml +++ b/roles/openshift_manage_node/tasks/main.yml @@ -13,10 +13,11 @@ {{ openshift.common.admin_binary }} manage-node {{ item.openshift.common.hostname | lower }} --schedulable={{ 'true' if item.openshift.node.schedulable | bool else 'false' }} with_items: - "{{ openshift_node_vars }}" + when: item.openshift.common.hostname is defined - name: Label nodes command: > {{ openshift.common.client_binary }} label --overwrite node {{ item.openshift.common.hostname | lower }} {{ item.openshift.node.labels | oo_combine_dict }} with_items: - "{{ openshift_node_vars }}" - when: "'labels' in item.openshift.node and item.openshift.node.labels != {}" + when: item.openshift.common.hostname is defined and 'labels' in item.openshift.node and item.openshift.node.labels != {} |