From 4e164964947ae9e57baf35ce24fa3455b37cdf0a Mon Sep 17 00:00:00 2001 From: Samuel Munilla Date: Thu, 25 Aug 2016 11:12:22 -0400 Subject: a-o-i: Fix openshift_node_labels Handle openshift_node_labels separately because they need to be doublequoted. --- utils/src/ooinstall/openshift_ansible.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'utils/src') diff --git a/utils/src/ooinstall/openshift_ansible.py b/utils/src/ooinstall/openshift_ansible.py index bd0d96d09..80a79a6d2 100644 --- a/utils/src/ooinstall/openshift_ansible.py +++ b/utils/src/ooinstall/openshift_ansible.py @@ -36,7 +36,6 @@ HOST_VARIABLES_MAP = { 'public_ip': 'openshift_public_ip', 'hostname': 'openshift_hostname', 'public_hostname': 'openshift_public_hostname', - 'node_labels': 'openshift_node_labels', 'containerized': 'containerized', } @@ -200,6 +199,9 @@ def write_host(host, role, inventory, schedulable=None): for variable, value in host.other_variables.iteritems(): facts += " {}={}".format(variable, value) + if host.node_labels and role == 'node': + 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: if role != 'node' or schedulable is None: -- cgit v1.2.3