summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorjawed <jawed.khelil@amadeus.com>2016-07-20 11:53:57 +0200
committerjawed <jawed.khelil@amadeus.com>2016-08-09 12:03:23 +0200
commit75df5713bc1b1d3cf454a6975e2ed8eea528a8a3 (patch)
tree4df2f03759dcfccc4db40161aa2340f7e4e77914 /roles
parent9e0e8485638e36f1bacbd8e1c5df134a5a7595f0 (diff)
downloadopenshift-75df5713bc1b1d3cf454a6975e2ed8eea528a8a3.tar.gz
openshift-75df5713bc1b1d3cf454a6975e2ed8eea528a8a3.tar.bz2
openshift-75df5713bc1b1d3cf454a6975e2ed8eea528a8a3.tar.xz
openshift-75df5713bc1b1d3cf454a6975e2ed8eea528a8a3.zip
fixing openshift key error in case of node failure during run (ssh issue)
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_manage_node/tasks/main.yml3
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 != {}