diff options
| author | Andrew Butcher <abutcher@afrolegs.com> | 2016-09-09 10:37:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-09 10:37:16 -0400 |
| commit | 242aeba73a60a7ad113a80e8141478fe67b695a5 (patch) | |
| tree | 32ba0a33db368609dc71ec8a84141af30b5e9566 /playbooks | |
| parent | eaf2932db8d86bf47cf54a5da4315c464b1c7abe (diff) | |
| parent | 70c62ffe21b7b90c23a8a35d4d52c4e23091e421 (diff) | |
| download | openshift-242aeba73a60a7ad113a80e8141478fe67b695a5.tar.gz openshift-242aeba73a60a7ad113a80e8141478fe67b695a5.tar.bz2 openshift-242aeba73a60a7ad113a80e8141478fe67b695a5.tar.xz openshift-242aeba73a60a7ad113a80e8141478fe67b695a5.zip | |
Merge pull request #2422 from abutcher/manage-node-hostnames
Fix node label / schedulability when inventory_hostname != openshift.common.hostname
Diffstat (limited to 'playbooks')
| -rw-r--r-- | playbooks/common/openshift-node/config.yml | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/playbooks/common/openshift-node/config.yml b/playbooks/common/openshift-node/config.yml index 94c30e268..66eb293e5 100644 --- a/playbooks/common/openshift-node/config.yml +++ b/playbooks/common/openshift-node/config.yml @@ -156,9 +156,7 @@ - name: Set schedulability hosts: oo_first_master vars: - openshift_nodes: "{{ hostvars - | oo_select_keys(groups['oo_nodes_to_config']) - | oo_collect('openshift.common.hostname') }}" + openshift_nodes: "{{ groups.oo_nodes_to_config | default([]) }}" pre_tasks: # Necessary because when you're on a node that's also a master the master will be # restarted after the node restarts docker and it will take up to 60 seconds for |