diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-03-14 13:22:13 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-03-14 13:22:13 -0400 |
| commit | 238171804159ca5127b0a4d419bc7489b0fa8ab4 (patch) | |
| tree | 9777b16283726b27cb23cc682e68305de6bc1cb3 /roles/openshift_cli | |
| parent | 00ccce6741369f5cffdcca2a9511c57e3aff4b47 (diff) | |
| parent | 8f7b31051dae0cdb853ca2f7fb68c31a40ae2967 (diff) | |
| download | openshift-238171804159ca5127b0a4d419bc7489b0fa8ab4.tar.gz openshift-238171804159ca5127b0a4d419bc7489b0fa8ab4.tar.bz2 openshift-238171804159ca5127b0a4d419bc7489b0fa8ab4.tar.xz openshift-238171804159ca5127b0a4d419bc7489b0fa8ab4.zip | |
Merge pull request #1550 from detiber/docker_refactor
Docker role refactor
Diffstat (limited to 'roles/openshift_cli')
| -rw-r--r-- | roles/openshift_cli/meta/main.yml | 5 | ||||
| -rw-r--r-- | roles/openshift_cli/tasks/main.yml | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/roles/openshift_cli/meta/main.yml b/roles/openshift_cli/meta/main.yml index 1e8f8b719..4351e8f24 100644 --- a/roles/openshift_cli/meta/main.yml +++ b/roles/openshift_cli/meta/main.yml @@ -12,5 +12,6 @@ galaxy_info: categories: - cloud dependencies: -- { role: openshift_common } -- { role: docker } +- role: openshift_docker + when: openshift.common.is_containerized | bool +- role: openshift_common diff --git a/roles/openshift_cli/tasks/main.yml b/roles/openshift_cli/tasks/main.yml index 3b224416e..62a4dd690 100644 --- a/roles/openshift_cli/tasks/main.yml +++ b/roles/openshift_cli/tasks/main.yml @@ -4,7 +4,7 @@ local_facts: deployment_type: "{{ openshift_deployment_type }}" cli_image: "{{ osm_image | default(None) }}" - + - name: Install clients action: "{{ ansible_pkg_mgr }} name={{ openshift.common.service_type }}-clients state=present" when: not openshift.common.is_containerized | bool @@ -13,16 +13,16 @@ command: > docker pull {{ openshift.common.cli_image }}:{{ openshift_version }} 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: + file: path: "{{ item }}" state: link src: /usr/local/bin/openshift |