diff options
| author | Michael Gugino <gugino.michael@yahoo.com> | 2017-12-17 20:41:17 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-17 20:41:17 -0500 |
| commit | 84fb45dae49c0ff0ebc71222a74ff4729ead06c0 (patch) | |
| tree | 06e50dbfab4f5882daaf0ef142916ea4c5e2f13a /roles/openshift_manage_node | |
| parent | 8b71c2938d278f4418db0fdad1bf6f94585e87c7 (diff) | |
| parent | 42d3824ba0d5a1e2cff3dc3a179cf02e735bc5da (diff) | |
| download | openshift-84fb45dae49c0ff0ebc71222a74ff4729ead06c0.tar.gz openshift-84fb45dae49c0ff0ebc71222a74ff4729ead06c0.tar.bz2 openshift-84fb45dae49c0ff0ebc71222a74ff4729ead06c0.tar.xz openshift-84fb45dae49c0ff0ebc71222a74ff4729ead06c0.zip | |
Merge pull request #6456 from mgugino-upstream-stage/node-facts
Remove openshift_node_facts part 1
Diffstat (limited to 'roles/openshift_manage_node')
| -rw-r--r-- | roles/openshift_manage_node/tasks/main.yml | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/roles/openshift_manage_node/tasks/main.yml b/roles/openshift_manage_node/tasks/main.yml index a15f336e4..af22a1a03 100644 --- a/roles/openshift_manage_node/tasks/main.yml +++ b/roles/openshift_manage_node/tasks/main.yml @@ -50,10 +50,9 @@ name: "{{ openshift.node.nodename }}" kind: node state: add - labels: "{{ openshift.node.labels | oo_dict_to_list_of_dict }}" + labels: "{{ openshift_node_labels | oo_dict_to_list_of_dict }}" namespace: default when: - "'nodename' in openshift.node" - - "'labels' in openshift.node" - - openshift.node.labels != {} + - openshift_node_labels | default({}) != {} delegate_to: "{{ openshift_master_host }}" |