diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-03-03 15:37:53 -0500 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-03-03 15:37:53 -0500 |
| commit | 26b37a59d52665bf2b7663326dd72a2262faf844 (patch) | |
| tree | 67a8f2b9c5b472204f0e56560c3defe87a11c072 /roles/openshift_cli | |
| parent | aef4ac6419d80b7002a7a6ab13ef8d928408e8d0 (diff) | |
| parent | 322689ef0dc93a39cc9fef2d86eecfdc11e953ef (diff) | |
| download | openshift-26b37a59d52665bf2b7663326dd72a2262faf844.tar.gz openshift-26b37a59d52665bf2b7663326dd72a2262faf844.tar.bz2 openshift-26b37a59d52665bf2b7663326dd72a2262faf844.tar.xz openshift-26b37a59d52665bf2b7663326dd72a2262faf844.zip | |
Merge pull request #1483 from brenton/32upgrade
First past at the upgrade process for 3.2
Diffstat (limited to 'roles/openshift_cli')
| -rw-r--r-- | roles/openshift_cli/tasks/main.yml | 7 | ||||
| -rw-r--r-- | roles/openshift_cli/templates/openshift.j2 | 5 |
2 files changed, 4 insertions, 8 deletions
diff --git a/roles/openshift_cli/tasks/main.yml b/roles/openshift_cli/tasks/main.yml index a6b6b1925..e9d7f4afe 100644 --- a/roles/openshift_cli/tasks/main.yml +++ b/roles/openshift_cli/tasks/main.yml @@ -9,11 +9,6 @@ action: "{{ ansible_pkg_mgr }} name={{ openshift.common.service_type }}-clients state=present" when: not openshift.common.is_containerized | bool -- name: Pull CLI Image - command: > - docker pull {{ openshift.common.cli_image }} - when: openshift.common.is_containerized | bool - - name: Create /usr/local/bin/openshift cli wrapper template: src: openshift.j2 @@ -30,4 +25,4 @@ - /usr/local/bin/oadm - /usr/local/bin/oc - /usr/local/bin/kubectl - when: openshift.common.is_containerized | bool
\ No newline at end of file + when: openshift.common.is_containerized | bool diff --git a/roles/openshift_cli/templates/openshift.j2 b/roles/openshift_cli/templates/openshift.j2 index a7c148a22..f969a4bab 100644 --- a/roles/openshift_cli/templates/openshift.j2 +++ b/roles/openshift_cli/templates/openshift.j2 @@ -5,10 +5,11 @@ fi cmd=`basename $0` user=`id -u` group=`id -g` +image_tag={{ image_tag | default(openshift.common.image_tag) }} >&2 echo """ ================================================================================ -ATTENTION: You are running ${cmd} via a wrapper around 'docker run {{ openshift.common.cli_image }}'. +ATTENTION: You are running ${cmd} via a wrapper around 'docker run {{ openshift.common.cli_image }}:${image_tag}'. This wrapper is intended only to be used to bootstrap an environment. Please install client tools on another host once you have granted cluster-admin privileges to a user. @@ -20,4 +21,4 @@ See https://docs.openshift.org/latest/cli_reference/get_started_cli.html ================================================================================= """ -docker run -i --privileged --net=host --user=${user}:${group} -v ~/.kube:/root/.kube -v /tmp:/tmp -v {{ openshift.common.config_base}}:{{ openshift.common.config_base }} -e KUBECONFIG=/root/.kube/config --entrypoint ${cmd} --rm {{ openshift.common.cli_image }} "${@}" +docker run -i --privileged --net=host --user=${user}:${group} -v ~/.kube:/root/.kube -v /tmp:/tmp -v {{ openshift.common.config_base}}:{{ openshift.common.config_base }} -e KUBECONFIG=/root/.kube/config --entrypoint ${cmd} --rm {{ openshift.common.cli_image }}:${image_tag} "${@}" |