From 6e8053c2c32b8142931fd09fb49c62a449bc08cb Mon Sep 17 00:00:00 2001 From: EKbfh Date: Mon, 23 May 2022 12:30:16 +0000 Subject: [PATCH 1/2] Merge branch 'change-clickhouse-repo' into 'master' change repo clickhouse See merge request noc/noc!6301 (cherry picked from commit 70d16f836e4901b1f6745a21e8bb83aa0efe0b2f) 5a84cfe0 change repo clickhouse 2fb4ae46 add repo clickhouse [skip-ci] 6ca47cc4 add repo clickhouse, rm comments [skip-ci] b7b83193 change version ch [skip-ci] b5c43a45 add repo ch for debian family [skip-ci] 343e64e8 add repo ch for debian family e655d25d add repo ch for RH family [skip-ci] 40c9deb0 add repo ch for RH family --- ansible/system_roles/clickhouse/defaults/main.yml | 2 +- ansible/system_roles/clickhouse/tasks/os/CentOS_7/main.yml | 2 +- ansible/system_roles/clickhouse/tasks/os/Debian_10/main.yml | 4 ++-- ansible/system_roles/clickhouse/tasks/os/Debian_11/main.yml | 4 ++-- ansible/system_roles/clickhouse/tasks/os/Debian_9/main.yml | 4 ++-- .../system_roles/clickhouse/tasks/os/OracleLinux_7/main.yml | 2 +- ansible/system_roles/clickhouse/tasks/os/RedHat_7/main.yml | 2 +- ansible/system_roles/clickhouse/tasks/os/Ubuntu_16/main.yml | 4 ++-- ansible/system_roles/clickhouse/tasks/os/Ubuntu_18/main.yml | 4 ++-- ansible/system_roles/clickhouse/tasks/os/Ubuntu_20/main.yml | 4 ++-- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/ansible/system_roles/clickhouse/defaults/main.yml b/ansible/system_roles/clickhouse/defaults/main.yml index 6f89e22177..755bfeb68f 100644 --- a/ansible/system_roles/clickhouse/defaults/main.yml +++ b/ansible/system_roles/clickhouse/defaults/main.yml @@ -5,7 +5,7 @@ ch_big_query_dir: "{{ ch_data_dir }}/tmp" clickhouse_http_port: 8123 clickhouse_max_ast_elements: 10000 clickhouse_timezone: "Europe/Moscow" -clickhouse_version: 21.8.5.7 +clickhouse_version: 22.4.5.9 clickhouse_expose_metrics: "True" clickhouse_service_name: clickhouse-server diff --git a/ansible/system_roles/clickhouse/tasks/os/CentOS_7/main.yml b/ansible/system_roles/clickhouse/tasks/os/CentOS_7/main.yml index 079851d03f..b0c4a0e6c7 100644 --- a/ansible/system_roles/clickhouse/tasks/os/CentOS_7/main.yml +++ b/ansible/system_roles/clickhouse/tasks/os/CentOS_7/main.yml @@ -3,7 +3,7 @@ yum_repository: name: clickhouse description: Clickhouse Official repo - baseurl: https://repo.yandex.ru/clickhouse/rpm/stable/x86_64 + baseurl: https://packages.clickhouse.com/rpm/stable/ gpgcheck: "False" enabled: "True" environment: diff --git a/ansible/system_roles/clickhouse/tasks/os/Debian_10/main.yml b/ansible/system_roles/clickhouse/tasks/os/Debian_10/main.yml index 4b1ceede46..d47c3b4c85 100644 --- a/ansible/system_roles/clickhouse/tasks/os/Debian_10/main.yml +++ b/ansible/system_roles/clickhouse/tasks/os/Debian_10/main.yml @@ -2,7 +2,7 @@ - name: Add CH apt key apt_key: keyserver: keyserver.ubuntu.com - id: E0C56BD4 + id: 8919F6BD2B48D754 environment: https_proxy: "{ {http_proxy }}" http_proxy: "{{ http_proxy }}" @@ -11,7 +11,7 @@ - name: Add CH repository apt_repository: - repo: "deb http://repo.yandex.ru/clickhouse/deb/stable/ main/" + repo: "deb https://packages.clickhouse.com/deb stable main" state: present update_cache: "True" environment: diff --git a/ansible/system_roles/clickhouse/tasks/os/Debian_11/main.yml b/ansible/system_roles/clickhouse/tasks/os/Debian_11/main.yml index 4b1ceede46..d47c3b4c85 100644 --- a/ansible/system_roles/clickhouse/tasks/os/Debian_11/main.yml +++ b/ansible/system_roles/clickhouse/tasks/os/Debian_11/main.yml @@ -2,7 +2,7 @@ - name: Add CH apt key apt_key: keyserver: keyserver.ubuntu.com - id: E0C56BD4 + id: 8919F6BD2B48D754 environment: https_proxy: "{ {http_proxy }}" http_proxy: "{{ http_proxy }}" @@ -11,7 +11,7 @@ - name: Add CH repository apt_repository: - repo: "deb http://repo.yandex.ru/clickhouse/deb/stable/ main/" + repo: "deb https://packages.clickhouse.com/deb stable main" state: present update_cache: "True" environment: diff --git a/ansible/system_roles/clickhouse/tasks/os/Debian_9/main.yml b/ansible/system_roles/clickhouse/tasks/os/Debian_9/main.yml index 4b1ceede46..d47c3b4c85 100644 --- a/ansible/system_roles/clickhouse/tasks/os/Debian_9/main.yml +++ b/ansible/system_roles/clickhouse/tasks/os/Debian_9/main.yml @@ -2,7 +2,7 @@ - name: Add CH apt key apt_key: keyserver: keyserver.ubuntu.com - id: E0C56BD4 + id: 8919F6BD2B48D754 environment: https_proxy: "{ {http_proxy }}" http_proxy: "{{ http_proxy }}" @@ -11,7 +11,7 @@ - name: Add CH repository apt_repository: - repo: "deb http://repo.yandex.ru/clickhouse/deb/stable/ main/" + repo: "deb https://packages.clickhouse.com/deb stable main" state: present update_cache: "True" environment: diff --git a/ansible/system_roles/clickhouse/tasks/os/OracleLinux_7/main.yml b/ansible/system_roles/clickhouse/tasks/os/OracleLinux_7/main.yml index 079851d03f..b0c4a0e6c7 100644 --- a/ansible/system_roles/clickhouse/tasks/os/OracleLinux_7/main.yml +++ b/ansible/system_roles/clickhouse/tasks/os/OracleLinux_7/main.yml @@ -3,7 +3,7 @@ yum_repository: name: clickhouse description: Clickhouse Official repo - baseurl: https://repo.yandex.ru/clickhouse/rpm/stable/x86_64 + baseurl: https://packages.clickhouse.com/rpm/stable/ gpgcheck: "False" enabled: "True" environment: diff --git a/ansible/system_roles/clickhouse/tasks/os/RedHat_7/main.yml b/ansible/system_roles/clickhouse/tasks/os/RedHat_7/main.yml index 079851d03f..b0c4a0e6c7 100644 --- a/ansible/system_roles/clickhouse/tasks/os/RedHat_7/main.yml +++ b/ansible/system_roles/clickhouse/tasks/os/RedHat_7/main.yml @@ -3,7 +3,7 @@ yum_repository: name: clickhouse description: Clickhouse Official repo - baseurl: https://repo.yandex.ru/clickhouse/rpm/stable/x86_64 + baseurl: https://packages.clickhouse.com/rpm/stable/ gpgcheck: "False" enabled: "True" environment: diff --git a/ansible/system_roles/clickhouse/tasks/os/Ubuntu_16/main.yml b/ansible/system_roles/clickhouse/tasks/os/Ubuntu_16/main.yml index ef33d02379..f54cb1635d 100644 --- a/ansible/system_roles/clickhouse/tasks/os/Ubuntu_16/main.yml +++ b/ansible/system_roles/clickhouse/tasks/os/Ubuntu_16/main.yml @@ -2,7 +2,7 @@ - name: Add CH apt key apt_key: keyserver: keyserver.ubuntu.com - id: E0C56BD4 + id: 8919F6BD2B48D754 environment: https_proxy: "{ {http_proxy }}" http_proxy: "{{ http_proxy }}" @@ -11,7 +11,7 @@ - name: Add CH repository apt_repository: - repo: "deb http://repo.yandex.ru/clickhouse/deb/stable/ main/" + repo: "deb https://packages.clickhouse.com/deb stable main" state: present update_cache: "True" environment: diff --git a/ansible/system_roles/clickhouse/tasks/os/Ubuntu_18/main.yml b/ansible/system_roles/clickhouse/tasks/os/Ubuntu_18/main.yml index ef33d02379..f54cb1635d 100644 --- a/ansible/system_roles/clickhouse/tasks/os/Ubuntu_18/main.yml +++ b/ansible/system_roles/clickhouse/tasks/os/Ubuntu_18/main.yml @@ -2,7 +2,7 @@ - name: Add CH apt key apt_key: keyserver: keyserver.ubuntu.com - id: E0C56BD4 + id: 8919F6BD2B48D754 environment: https_proxy: "{ {http_proxy }}" http_proxy: "{{ http_proxy }}" @@ -11,7 +11,7 @@ - name: Add CH repository apt_repository: - repo: "deb http://repo.yandex.ru/clickhouse/deb/stable/ main/" + repo: "deb https://packages.clickhouse.com/deb stable main" state: present update_cache: "True" environment: diff --git a/ansible/system_roles/clickhouse/tasks/os/Ubuntu_20/main.yml b/ansible/system_roles/clickhouse/tasks/os/Ubuntu_20/main.yml index ef33d02379..f54cb1635d 100644 --- a/ansible/system_roles/clickhouse/tasks/os/Ubuntu_20/main.yml +++ b/ansible/system_roles/clickhouse/tasks/os/Ubuntu_20/main.yml @@ -2,7 +2,7 @@ - name: Add CH apt key apt_key: keyserver: keyserver.ubuntu.com - id: E0C56BD4 + id: 8919F6BD2B48D754 environment: https_proxy: "{ {http_proxy }}" http_proxy: "{{ http_proxy }}" @@ -11,7 +11,7 @@ - name: Add CH repository apt_repository: - repo: "deb http://repo.yandex.ru/clickhouse/deb/stable/ main/" + repo: "deb https://packages.clickhouse.com/deb stable main" state: present update_cache: "True" environment: -- GitLab From 53b07fb0348f5d65694454a42eadcfda302bd1d8 Mon Sep 17 00:00:00 2001 From: EKbfh Date: Mon, 23 May 2022 12:37:04 +0000 Subject: [PATCH 2/2] Update ansible/system_roles/clickhouse/defaults/main.yml --- ansible/system_roles/clickhouse/defaults/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/ansible/system_roles/clickhouse/defaults/main.yml b/ansible/system_roles/clickhouse/defaults/main.yml index 755bfeb68f..c130aca56e 100644 --- a/ansible/system_roles/clickhouse/defaults/main.yml +++ b/ansible/system_roles/clickhouse/defaults/main.yml @@ -9,6 +9,7 @@ clickhouse_version: 22.4.5.9 clickhouse_expose_metrics: "True" clickhouse_service_name: clickhouse-server + ch_etc_path: "{{ etc_prefix }}/clickhouse-server" ch_dictionaries_path: "{{ ch_etc_path }}/dictionaries" -- GitLab