summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-01-24 20:25:06 -0800
committerGitHub <noreply@github.com>2018-01-24 20:25:06 -0800
commitab7fae1c776915d834a2a81a1a6b0f5d3e108336 (patch)
treeae188e8a2cb19540d0695217aed4c710a468da66
parent302a49e0aaa737f5fe3ecebe807cefee28916a09 (diff)
parentb0af77325be0b33254bb991c69aa85a93f74876c (diff)
downloadopenshift-ab7fae1c776915d834a2a81a1a6b0f5d3e108336.tar.gz
openshift-ab7fae1c776915d834a2a81a1a6b0f5d3e108336.tar.bz2
openshift-ab7fae1c776915d834a2a81a1a6b0f5d3e108336.tar.xz
openshift-ab7fae1c776915d834a2a81a1a6b0f5d3e108336.zip
Merge pull request #6848 from mgugino-upstream-stage/remove-fact-labels
Automatic merge from submit-queue. Remove unused node.lables from openshift_facts
-rwxr-xr-xroles/openshift_facts/library/openshift_facts.py3
1 files changed, 0 insertions, 3 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py
index 26f0525e9..d6d31effd 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -1430,9 +1430,6 @@ class OpenShiftFacts(object):
dynamic_provisioning_enabled=True,
max_requests_inflight=500)
- if 'node' in roles:
- defaults['node'] = dict(labels={})
-
if 'cloudprovider' in roles:
defaults['cloudprovider'] = dict(kind=None)