Skip to content
This repository has been archived by the owner on Jun 24, 2021. It is now read-only.

Get version from variable for tiflash #1118

Merged
merged 1 commit into from
Jan 14, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions roles/local/tasks/binary_deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
- name: download TiFlash packages
get_url:
url: "{{ item.url }}"
dest: "{{ downloads_dir }}/{{ item.name }}"
dest: "{{ downloads_dir }}/{{ item.name }}-{{ item.version }}.tar.gz"
checksum: "{{ item.checksum | default(omit) }}"
force: yes
validate_certs: no
Expand All @@ -62,7 +62,6 @@
with_items: "{{ tiflash_packages }}"
when:
- has_outbound_network
- not deploy_without_tidb|default(false)

- name: unarchive third party binary
shell: ls -1 {{ item.name }}-{{ item.version }}.tar.gz | xargs -n1 tar xzf
Expand All @@ -86,11 +85,11 @@
when: not deploy_without_tidb|default(false)

- name: unarchive tiflash
shell: tar xzf tiflash-latest-linux-amd64.tar.gz
shell: ls -1 {{ item.name }}-{{ item.version }}.tar.gz | xargs tar xzf
args:
chdir: "{{ downloads_dir }}"
warn: no
when: not deploy_without_tidb|default(false)
with_items: "{{ tiflash_packages }}"

- name: cp monitoring binary
shell: >
Expand All @@ -114,5 +113,5 @@

- name: cp tiflash directory
shell: >
cp -rfv {{ downloads_dir }}/tiflash-{{ item.version }}-linux-amd64 "{{ resources_dir }}/bin/tiflash"
cp -rfv {{ downloads_dir }}/{{ item.name }}-{{ item.version }}-linux-amd64 "{{ resources_dir }}/bin/tiflash"
with_items: "{{ tiflash_packages }}"
6 changes: 3 additions & 3 deletions roles/local/templates/binary_packages.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,6 @@ tispark_packages:
{% endif %}

tiflash_packages:
- name: tiflash-latest-linux-amd64.tar.gz
version: latest
url: http://download.pingcap.org/tiflash-latest-linux-amd64.tar.gz
- name: tiflash
version: {{ tidb_version }}
url: http://download.pingcap.org/tiflash-{{ tidb_version }}-linux-amd64.tar.gz
31 changes: 0 additions & 31 deletions roles/tiflash/vars/tiflash-user.yml

This file was deleted.