External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-04-05 01:59:25 -02:30
Code Issues Packages Projects Releases Wiki Activity

Fix installer for oc 4.3

Browse Source
This commit is contained in:
Shane McDonald
2020-05-06 11:37:08 -04:00
parent 3aa6e8a457
commit a461df0e4d
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,12 @@
--- ---
- 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 - include_vars: openshift.yml
- name: Set kubernetes_namespace - 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_config_file: "{{ kubernetes_base_path }}/.kube/config"
openshift_oc_bin: "oc --config={{ openshift_oc_config_file }}" openshift_oc_bin: "oc {{ oc_kubeconfig_option }}={{ openshift_oc_config_file }}"