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

Merge pull request #1070 from vrutkovs/installer-ocp-token

Browse Source 
Allow authenticating with Openshift via a token
This commit is contained in:
Shane McDonald
2018-02-22 13:40:01 -05:00
committed by GitHub
parent 2ebee58727 5e25859069
commit c0fe6866c4
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
installer/check_vars/tasks/check_openshift.yml
View File

@@ -12,11 +12,12 @@
- openshift_user is defined and openshift_user != '' - openshift_user is defined and openshift_user != ''
msg: "Set the value of 'openshift_user' in the inventory file." msg: "Set the value of 'openshift_user' in the inventory file."
- name: openshift_password should be defined - name: openshift_password or openshift_token should be defined
assert: assert:
that: that:
- openshift_password is defined and openshift_password != '' - (openshift_password is defined and openshift_password != '') or
msg: "Set the value of 'openshift_password' in the inventory file." (openshift_token is defined and openshift_token != '')
msg: "Set the value of 'openshift_password' or 'openshift_token' in the inventory file."
- name: docker_registry should be defined if not using dockerhub - name: docker_registry should be defined if not using dockerhub
assert: assert:

10
installer/openshift/tasks/main.yml
View File

@@ -1,6 +1,14 @@
--- ---
- name: Authenticate with OpenShift - name: Authenticate with OpenShift via user and password
shell: "oc login {{ openshift_host }} -u {{ openshift_user }} -p {{ openshift_password }}" shell: "oc login {{ openshift_host }} -u {{ openshift_user }} -p {{ openshift_password }}"
when:
- openshift_user is defined
- openshift_password is defined
- openshift_token is not defined
- name: Authenticate with OpenShift via token
shell: "oc login {{ openshift_host }} --token {{ openshift_token }}"
when: openshift_token is defined
- name: Get Project Detail - name: Get Project Detail
shell: "oc get project {{ awx_openshift_project }}" shell: "oc get project {{ awx_openshift_project }}"