External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-17 04:31:21 -03:30
Code Issues Packages Projects Releases Wiki Activity

Hardcode --kubeconfig and therefore only support OpenShift 3.11+

Browse Source 
Avoid trying to parse inconsitent oc --version output
This commit is contained in:
Bill Nottingham 2020-05-29 13:41:49 -04:00
parent 38025e1926
commit 0f0e401c98
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
installer/roles/kubernetes/tasks/openshift_auth.yml
View File

@ -1,12 +1,4 @@
---
- name: Determine version of oc
shell: oc version | sed -n 's/oc v//p'
register: oc_version
- name: Use correct cli option for kubeconfig
set_fact:
oc_kubeconfig_option: "{{ '--kubeconfig' if oc_version.stdout is version('3.11', '>=') else '--config' }}"
- include_vars: openshift.yml
- name: Set kubernetes_namespace

2
installer/roles/kubernetes/vars/openshift.yml
View File

@ -1,3 +1,3 @@
---
openshift_oc_config_file: "{{ kubernetes_base_path }}/.kube/config"
openshift_oc_bin: "oc {{ oc_kubeconfig_option }}={{ openshift_oc_config_file }}"
openshift_oc_bin: "oc --kubeconfig={{ openshift_oc_config_file }}"