diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-07-14 18:49:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-14 18:49:24 -0400 |
| commit | 65ffae3e6edc8902c591dfef792a505a16029698 (patch) | |
| tree | a28948529ce2a4c8b700aaf5352173be1aea8f8a /roles/openshift_cli | |
| parent | 1a6b1bf010b661feb8495d4088f9a0f2640b5658 (diff) | |
| parent | 03f31fdc581eea090388b5a60b3818167eb47c0c (diff) | |
| download | openshift-65ffae3e6edc8902c591dfef792a505a16029698.tar.gz openshift-65ffae3e6edc8902c591dfef792a505a16029698.tar.bz2 openshift-65ffae3e6edc8902c591dfef792a505a16029698.tar.xz openshift-65ffae3e6edc8902c591dfef792a505a16029698.zip | |
Merge pull request #1945 from dgoodwin/upgrade33
openshift_release / version / upgrade improvements
Diffstat (limited to 'roles/openshift_cli')
| -rw-r--r-- | roles/openshift_cli/defaults/main.yml | 1 | ||||
| -rw-r--r-- | roles/openshift_cli/tasks/main.yml | 5 | ||||
| -rw-r--r-- | roles/openshift_cli/templates/openshift.j2 | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/roles/openshift_cli/defaults/main.yml b/roles/openshift_cli/defaults/main.yml index 7baa87ab8..ed97d539c 100644 --- a/roles/openshift_cli/defaults/main.yml +++ b/roles/openshift_cli/defaults/main.yml @@ -1,2 +1 @@ --- -openshift_version: "{{ openshift_image_tag | default(openshift.docker.openshift_image_tag | default('')) }}" diff --git a/roles/openshift_cli/tasks/main.yml b/roles/openshift_cli/tasks/main.yml index 1cb1e03b9..4d6219b94 100644 --- a/roles/openshift_cli/tasks/main.yml +++ b/roles/openshift_cli/tasks/main.yml @@ -5,7 +5,7 @@ - name: Pull CLI Image command: > - docker pull {{ openshift.common.cli_image }}{{ ':' + openshift_version if openshift_version is defined and openshift_version != '' else '' }} + docker pull {{ openshift.common.cli_image }}:{{ openshift_image_tag }} when: openshift.common.is_containerized | bool - name: Create /usr/local/bin/openshift cli wrapper @@ -26,6 +26,9 @@ - /usr/local/bin/kubectl when: openshift.common.is_containerized | bool +- name: Reload facts to pick up installed OpenShift version + openshift_facts: + - name: Install bash completion for oc tools action: "{{ ansible_pkg_mgr }} name=bash-completion state=present" when: not openshift.common.is_containerized | bool diff --git a/roles/openshift_cli/templates/openshift.j2 b/roles/openshift_cli/templates/openshift.j2 index 8a3f3a257..7786acead 100644 --- a/roles/openshift_cli/templates/openshift.j2 +++ b/roles/openshift_cli/templates/openshift.j2 @@ -5,7 +5,7 @@ fi cmd=`basename $0` user=`id -u` group=`id -g` -image_tag="{{ openshift_version }}" +image_tag="{{ openshift_image_tag }}" >&2 echo """ ================================================================================ |