From 327a5b4d1fc27d7038f957a05c91cd4cdca33c7c Mon Sep 17 00:00:00 2001 From: dkorn Date: Wed, 27 Jul 2016 11:43:53 +0300 Subject: a-o-i: write missing openshift_node_labels --- utils/src/ooinstall/openshift_ansible.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/utils/src/ooinstall/openshift_ansible.py b/utils/src/ooinstall/openshift_ansible.py index a41de7378..a63ada0be 100644 --- a/utils/src/ooinstall/openshift_ansible.py +++ b/utils/src/ooinstall/openshift_ansible.py @@ -211,6 +211,8 @@ def write_host(host, inventory, schedulable=None): if host.other_variables: for variable, value in host.other_variables.iteritems(): facts += " {}={}".format(variable, value) + if host.node_labels: + facts += ' openshift_node_labels="{}"'.format(host.node_labels) # Distinguish between three states, no schedulability specified (use default), # explicitly set to True, or explicitly set to False: -- cgit v1.2.3 From 39661a239eba6cd7fe4ff617b60986cb555b3a18 Mon Sep 17 00:00:00 2001 From: Scott Dodson Date: Wed, 27 Jul 2016 16:02:50 -0400 Subject: Disable too many branches pylint --- utils/src/ooinstall/openshift_ansible.py | 1 + 1 file changed, 1 insertion(+) diff --git a/utils/src/ooinstall/openshift_ansible.py b/utils/src/ooinstall/openshift_ansible.py index a63ada0be..bcf06b599 100644 --- a/utils/src/ooinstall/openshift_ansible.py +++ b/utils/src/ooinstall/openshift_ansible.py @@ -117,6 +117,7 @@ def write_inventory_children(base_inventory, multiple_masters, proxy, scaleup): if not getattr(proxy, 'preconfigured', True): base_inventory.write('lb\n') +# pylint: disable=too-many-branches def write_inventory_vars(base_inventory, multiple_masters, proxy): global CFG base_inventory.write('\n[OSEv3:vars]\n') -- cgit v1.2.3