summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Butcher <abutcher@redhat.com>2016-09-08 14:46:27 -0400
committerAndrew Butcher <abutcher@redhat.com>2016-09-08 14:49:29 -0400
commit70c62ffe21b7b90c23a8a35d4d52c4e23091e421 (patch)
tree005a95236286e0dd42cdef1a1f2e745fb61686ad
parent52eeaed447a97a85d0266036136ac611be13bbae (diff)
downloadopenshift-70c62ffe21b7b90c23a8a35d4d52c4e23091e421.tar.gz
openshift-70c62ffe21b7b90c23a8a35d4d52c4e23091e421.tar.bz2
openshift-70c62ffe21b7b90c23a8a35d4d52c4e23091e421.tar.xz
openshift-70c62ffe21b7b90c23a8a35d4d52c4e23091e421.zip
Iterate over node inventory hostnames instead of openshift.common.hostname within openshift_manage_node role.
-rw-r--r--playbooks/common/openshift-node/config.yml4
-rw-r--r--roles/openshift_manage_node/tasks/main.yml8
2 files changed, 4 insertions, 8 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
diff --git a/roles/openshift_manage_node/tasks/main.yml b/roles/openshift_manage_node/tasks/main.yml
index f999092cc..f45ade751 100644
--- a/roles/openshift_manage_node/tasks/main.yml
+++ b/roles/openshift_manage_node/tasks/main.yml
@@ -14,7 +14,7 @@
- name: Wait for Node Registration
command: >
- {{ openshift.common.client_binary }} get node {{ item | lower }}
+ {{ openshift.common.client_binary }} get node {{ hostvars[item].openshift.common.hostname | lower }}
--config={{ openshift_manage_node_kubeconfig }}
-n default
register: omd_get_node
@@ -29,8 +29,7 @@
{{ openshift.common.admin_binary }} manage-node {{ hostvars[item].openshift.common.hostname | lower }} --schedulable={{ 'true' if hostvars[item].openshift.node.schedulable | bool else 'false' }}
--config={{ openshift_manage_node_kubeconfig }}
-n default
- with_items:
- - "{{ openshift_nodes }}"
+ with_items: "{{ openshift_nodes }}"
when: hostvars[item].openshift.common.hostname is defined
- name: Label nodes
@@ -38,8 +37,7 @@
{{ openshift.common.client_binary }} label --overwrite node {{ hostvars[item].openshift.common.hostname | lower }} {{ hostvars[item].openshift.node.labels | oo_combine_dict }}
--config={{ openshift_manage_node_kubeconfig }}
-n default
- with_items:
- - "{{ openshift_nodes }}"
+ with_items: "{{ openshift_nodes }}"
when: hostvars[item].openshift.common.hostname is defined and 'labels' in hostvars[item].openshift.node and hostvars[item].openshift.node.labels != {}
- name: Delete temp directory