diff options
| author | Devan Goodwin <dgoodwin@redhat.com> | 2016-05-20 15:14:28 -0300 |
|---|---|---|
| committer | Devan Goodwin <dgoodwin@redhat.com> | 2016-05-25 10:28:32 -0300 |
| commit | c45562e0e03e03c82bfcf60d4b3f8b7793133301 (patch) | |
| tree | 5fe68e26ac01ebb58b30c0b116d213623f10a610 /roles/openshift_cli | |
| parent | dcb7289d9cf28b155aebb3b4ab820db2033c1b35 (diff) | |
| download | openshift-c45562e0e03e03c82bfcf60d4b3f8b7793133301.tar.gz openshift-c45562e0e03e03c82bfcf60d4b3f8b7793133301.tar.bz2 openshift-c45562e0e03e03c82bfcf60d4b3f8b7793133301.tar.xz openshift-c45562e0e03e03c82bfcf60d4b3f8b7793133301.zip | |
Set openshift_version in config playbooks for first master.
Starting to remove openshift.docker.openshift_version fact usage.
openshift_version should no longer contain a leading 'v' for
containerized installs, just a version number.
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 | 4 |
3 files changed, 3 insertions, 7 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 a2be95eac..95711f95d 100644 --- a/roles/openshift_cli/tasks/main.yml +++ b/roles/openshift_cli/tasks/main.yml @@ -1,9 +1,6 @@ --- - debug: var=openshift_version -- debug: var=openshift_release -- debug: var=openshift_image_tag - debug: var=openshift.common -- debug: var=openshift.docker - name: Install clients action: "{{ ansible_pkg_mgr }} name={{ openshift.common.service_type }}-clients state=present" @@ -11,7 +8,7 @@ - name: Pull CLI Image command: > - docker pull {{ openshift.common.cli_image }}:{{ openshift_version }} + docker pull {{ openshift.common.cli_image }}:v{{ openshift_version }} when: openshift.common.is_containerized | bool - name: Create /usr/local/bin/openshift cli wrapper diff --git a/roles/openshift_cli/templates/openshift.j2 b/roles/openshift_cli/templates/openshift.j2 index 437e08aab..501796b0b 100644 --- a/roles/openshift_cli/templates/openshift.j2 +++ b/roles/openshift_cli/templates/openshift.j2 @@ -5,14 +5,14 @@ fi cmd=`basename $0` user=`id -u` group=`id -g` -image_tag={{ openshift_version }} +image_tag=v{{ openshift_version }} >&2 echo """ ================================================================================ 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. +privileges to a user. {% if openshift.common.deployment_type in ['openshift-enterprise','atomic-enterprise'] %} See https://docs.openshift.com/enterprise/latest/cli_reference/get_started_cli.html {% else %} |