diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-07-21 12:13:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-21 12:13:10 -0400 |
| commit | d0c75ba21ba84a9df4a6cd12f02ce335ea4f9427 (patch) | |
| tree | ca3493c5fa3cd56d98a48312148040d2e8b430d2 /roles/openshift_cli/tasks | |
| parent | a355349a98cecec1d10e7d166aa70d8e77df20e1 (diff) | |
| parent | ca7767eab6674737a117a09f7f456b7918cffecf (diff) | |
| download | openshift-d0c75ba21ba84a9df4a6cd12f02ce335ea4f9427.tar.gz openshift-d0c75ba21ba84a9df4a6cd12f02ce335ea4f9427.tar.bz2 openshift-d0c75ba21ba84a9df4a6cd12f02ce335ea4f9427.tar.xz openshift-d0c75ba21ba84a9df4a6cd12f02ce335ea4f9427.zip | |
Merge pull request #2168 from dgoodwin/container-cli-speed
Copy openshift binary instead of using wrapper script.
Diffstat (limited to 'roles/openshift_cli/tasks')
| -rw-r--r-- | roles/openshift_cli/tasks/main.yml | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/roles/openshift_cli/tasks/main.yml b/roles/openshift_cli/tasks/main.yml index 4d6219b94..11c73b25c 100644 --- a/roles/openshift_cli/tasks/main.yml +++ b/roles/openshift_cli/tasks/main.yml @@ -6,24 +6,14 @@ - name: Pull CLI Image command: > docker pull {{ openshift.common.cli_image }}:{{ openshift_image_tag }} + register: pull_result + changed_when: "'Downloaded newer image' in pull_result.stdout" when: openshift.common.is_containerized | bool -- name: Create /usr/local/bin/openshift cli wrapper - template: - src: openshift.j2 - dest: /usr/local/bin/openshift - mode: 0755 - when: openshift.common.is_containerized | bool - -- name: Create client symlinks - file: - path: "{{ item }}" - state: link - src: /usr/local/bin/openshift - with_items: - - /usr/local/bin/oadm - - /usr/local/bin/oc - - /usr/local/bin/kubectl +- name: Copy client binaries/symlinks out of CLI image for use on the host + openshift_container_binary_sync: + image: "{{ openshift.common.cli_image }}" + tag: "{{ openshift_image_tag }}" when: openshift.common.is_containerized | bool - name: Reload facts to pick up installed OpenShift version |