diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-07-27 16:03:31 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-27 16:03:31 -0400 |
| commit | d4246bb6063383b7bb55a7c5a28d575214697f3c (patch) | |
| tree | b2967c3a1cd9866173e762629cd93b8853f48cbb | |
| parent | 21eb39662663939f89b77f2609ccb5f64d699813 (diff) | |
| parent | 39661a239eba6cd7fe4ff617b60986cb555b3a18 (diff) | |
Merge pull request #2229 from sdodson/dkorn-node_labels
a-o-i: write missing openshift_node_labels
| -rw-r--r-- | utils/src/ooinstall/openshift_ansible.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/utils/src/ooinstall/openshift_ansible.py b/utils/src/ooinstall/openshift_ansible.py index a41de7378..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') @@ -211,6 +212,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: |