summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorAndrew Butcher <abutcher@afrolegs.com>2016-09-07 16:51:45 -0400
committerGitHub <noreply@github.com>2016-09-07 16:51:45 -0400
commit52eeaed447a97a85d0266036136ac611be13bbae (patch)
tree8bbbce4d390f09292593119db10046a11803ab09 /roles
parent485f45b7d62b358ba477b76b4146f3338ea6a5c4 (diff)
parent75d4f13ad39a770a8954aef9507e5d136ecb3306 (diff)
downloadopenshift-52eeaed447a97a85d0266036136ac611be13bbae.tar.gz
openshift-52eeaed447a97a85d0266036136ac611be13bbae.tar.bz2
openshift-52eeaed447a97a85d0266036136ac611be13bbae.tar.xz
openshift-52eeaed447a97a85d0266036136ac611be13bbae.zip
Merge pull request #2417 from abutcher/manage-node-kubeconfig
Bug 1327409 - scaleup playbook uses current oc login which may not have enough permissions
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_manage_node/tasks/main.yml40
1 files changed, 33 insertions, 7 deletions
diff --git a/roles/openshift_manage_node/tasks/main.yml b/roles/openshift_manage_node/tasks/main.yml
index 5abac32cd..f999092cc 100644
--- a/roles/openshift_manage_node/tasks/main.yml
+++ b/roles/openshift_manage_node/tasks/main.yml
@@ -1,6 +1,22 @@
+---
+- name: Create temp directory for kubeconfig
+ command: mktemp -d /tmp/openshift-ansible-XXXXXX
+ register: mktemp
+ changed_when: False
+
+- set_fact:
+ openshift_manage_node_kubeconfig: "{{ mktemp.stdout }}/admin.kubeconfig"
+
+- name: Copy the admin client config(s)
+ command: >
+ cp {{ openshift.common.config_base }}/master/admin.kubeconfig {{ openshift_manage_node_kubeconfig }}
+ changed_when: False
+
- name: Wait for Node Registration
command: >
- {{ openshift.common.client_binary }} get node {{ item | lower }}
+ {{ openshift.common.client_binary }} get node {{ item | lower }}
+ --config={{ openshift_manage_node_kubeconfig }}
+ -n default
register: omd_get_node
until: omd_get_node.rc == 0
retries: 50
@@ -10,14 +26,24 @@
- name: Set node schedulability
command: >
- {{ openshift.common.admin_binary }} manage-node {{ item.openshift.common.hostname | lower }} --schedulable={{ 'true' if item.openshift.node.schedulable | bool else 'false' }}
+ {{ 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_node_vars }}"
- when: item.openshift.common.hostname is defined
+ - "{{ openshift_nodes }}"
+ when: hostvars[item].openshift.common.hostname is defined
- name: Label nodes
command: >
- {{ openshift.common.client_binary }} label --overwrite node {{ item.openshift.common.hostname | lower }} {{ item.openshift.node.labels | oo_combine_dict }}
+ {{ 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_node_vars }}"
- when: item.openshift.common.hostname is defined and 'labels' in item.openshift.node and item.openshift.node.labels != {}
+ - "{{ 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
+ file:
+ name: "{{ mktemp.stdout }}"
+ state: absent
+ changed_when: False