External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-27 07:56:06 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7189 from wenottingham/aaargh

Browse Source 
Hardcode --kubeconfig and therefore only support OpenShift 3.11+

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot]
2020-05-29 23:44:16 +00:00
committed by GitHub
parent 54167d9693 0f0e401c98
commit 9d42b8f0f2
2 changed files with 1 additions and 9 deletions
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 - 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 {{ oc_kubeconfig_option }}={{ openshift_oc_config_file }}" openshift_oc_bin: "oc --kubeconfig={{ openshift_oc_config_file }}"