diff options
| author | Jason DeTiberus <detiber@gmail.com> | 2016-09-30 14:54:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-30 14:54:16 -0400 |
| commit | 2128e5cfd89de206004e33d58ecfca594c87c3d7 (patch) | |
| tree | 7092c5972c4a8af80e71be21ec7a7a1a5ce552c7 /utils/src | |
| parent | 5746c82c54291aca3f50ee948b49a63d9ae4445b (diff) | |
| parent | 4e164964947ae9e57baf35ce24fa3455b37cdf0a (diff) | |
| download | openshift-2128e5cfd89de206004e33d58ecfca594c87c3d7.tar.gz openshift-2128e5cfd89de206004e33d58ecfca594c87c3d7.tar.bz2 openshift-2128e5cfd89de206004e33d58ecfca594c87c3d7.tar.xz openshift-2128e5cfd89de206004e33d58ecfca594c87c3d7.zip | |
Merge pull request #2535 from smunilla/BZ1368414_fix
Fix openshift_node_labels in generated hosts file
Diffstat (limited to 'utils/src')
| -rw-r--r-- | utils/src/ooinstall/openshift_ansible.py | 4 |
1 files changed, 3 insertions, 1 deletions
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: |