Skip to content

Commit

Permalink
Rework importing of os templates
Browse files Browse the repository at this point in the history
* Always load helper containers {linchpin,ansible}-executor
  * project_repo != sample_project_repo
* Reworked to reduce code duplication
* Remove switch to project we already do that
  • Loading branch information
Ari LiVigni committed Jun 5, 2018
1 parent 84693cc commit 2938dd2
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions playbooks/roles/os_temps/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,9 @@
import_tasks: install_oc_bin.yml
when: setup_minishift|bool == false

# Switch to right OpenShift project defined in {{ {{ openshift_project }}" }}
- name: "Switch to project {{ openshift_project }}"
shell: "{{ oc_bin }} project {{ openshift_project }}"

# Get ip of the cluster unless it was provided
- name: "Get the cluster Server URL for project {{ openshift_project }}"
shell: "{{ oc_bin }} status | egrep '{{ openshift_project }}.*server' | awk '{print $NF}'"
shell: "{{ oc_bin }} status | grep 'https' | awk '{print $NF}'"
register: cluster_ip_register
when: openshift_cluster_ip == ""

Expand Down

0 comments on commit 2938dd2

Please sign in to comment.