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
* Narrow match with head -1
  • Loading branch information
Ari LiVigni committed Jun 6, 2018
1 parent 2938dd2 commit 5c74fcf
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
6 changes: 1 addition & 5 deletions playbooks/roles/os_temps/tasks/get_set_project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,4 @@
when: project_query.stdout == ""

- name: add-role-to-user
shell: "{{ oc_bin }} policy add-role-to-user edit -z default -n '{{ openshift_project }}'"




shell: "{{ oc_bin }} policy add-role-to-user edit -z default -n '{{ openshift_project }}'"
2 changes: 1 addition & 1 deletion playbooks/roles/os_temps/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

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

Expand Down

0 comments on commit 5c74fcf

Please sign in to comment.