summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-08-09 13:27:21 -0400
committerGitHub <noreply@github.com>2016-08-09 13:27:21 -0400
commit62f64172e8d409b6f1111f8d1cc9688a58252bda (patch)
tree8a5de17f89fb3ad85b4fe1fb812fe8330ae17dc6
parent9e0e8485638e36f1bacbd8e1c5df134a5a7595f0 (diff)
parent2247149ba40538e4e88f94d87694c5f24918041a (diff)
downloadopenshift-62f64172e8d409b6f1111f8d1cc9688a58252bda.tar.gz
openshift-62f64172e8d409b6f1111f8d1cc9688a58252bda.tar.bz2
openshift-62f64172e8d409b6f1111f8d1cc9688a58252bda.tar.xz
openshift-62f64172e8d409b6f1111f8d1cc9688a58252bda.zip
Merge pull request #2275 from ganhuang/bz#1353163
a-o-i: Labeling nodes only
-rw-r--r--utils/src/ooinstall/openshift_ansible.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/utils/src/ooinstall/openshift_ansible.py b/utils/src/ooinstall/openshift_ansible.py
index f1e03f8f2..64ee23d8b 100644
--- a/utils/src/ooinstall/openshift_ansible.py
+++ b/utils/src/ooinstall/openshift_ansible.py
@@ -190,7 +190,8 @@ def write_host(host, role, inventory, schedulable=None):
for variable, value in host.other_variables.iteritems():
facts += " {}={}".format(variable, value)
if host.node_labels:
- facts += ' openshift_node_labels="{}"'.format(host.node_labels)
+ if role == 'node':
+ facts += ' openshift_node_labels="{}"'.format(host.node_labels)
# Distinguish between three states, no schedulability specified (use default),