From 5a84cfe0036f535da39d7ebe9b5fd3df2ce92226 Mon Sep 17 00:00:00 2001 From: YuriyDegtyarev Date: Fri, 20 May 2022 15:54:55 +0700 Subject: [PATCH 1/8] change repo clickhouse --- ansible/system_roles/clickhouse/tasks/os/CentOS_7/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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..28ccd8885c 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,8 @@ yum_repository: name: clickhouse description: Clickhouse Official repo - baseurl: https://repo.yandex.ru/clickhouse/rpm/stable/x86_64 + baseurl: https://packages.clickhouse.com/rpm/clickhouse.repo + reposdir: /etc/yum.repos.d/ gpgcheck: "False" enabled: "True" environment: -- GitLab From 2fb4ae46e3e281b1d880b5e44e04c70b8ccf106f Mon Sep 17 00:00:00 2001 From: YuriyDegtyarev Date: Fri, 20 May 2022 16:18:58 +0700 Subject: [PATCH 2/8] add repo clickhouse [skip-ci] --- .../clickhouse/tasks/os/CentOS_7/main.yml | 27 ++++++++++++------- 1 file changed, 17 insertions(+), 10 deletions(-) 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 28ccd8885c..14ca2d5e02 100644 --- a/ansible/system_roles/clickhouse/tasks/os/CentOS_7/main.yml +++ b/ansible/system_roles/clickhouse/tasks/os/CentOS_7/main.yml @@ -1,17 +1,24 @@ --- - name: Add CH repository - yum_repository: - name: clickhouse - description: Clickhouse Official repo - baseurl: https://packages.clickhouse.com/rpm/clickhouse.repo - reposdir: /etc/yum.repos.d/ - gpgcheck: "False" - enabled: "True" + shell: yum-config-manager --add-repo=https://packages.clickhouse.com/rpm/clickhouse.repo + args: + creates: /etc/yum.repos.d/clickhouse.repo environment: http_proxy: "{{ http_proxy }}" - https_proxy: "{{ http_proxy }}" - tags: - - repo + https_proxy: "{{ http_proxy }} + + # yum_repository: + # name: clickhouse + # description: Clickhouse Official repo + # baseurl: https://packages.clickhouse.com/rpm/clickhouse.repo + # reposdir: /etc/yum.repos.d/ + # gpgcheck: "False" + # enabled: "True" + # environment: + # http_proxy: "{{ http_proxy }}" + # https_proxy: "{{ http_proxy }}" + # tags: + # - repo - name: Install CH yum: -- GitLab From 6ca47cc42b33ebabc8aff7acaed42f8d96f0cee1 Mon Sep 17 00:00:00 2001 From: YuriyDegtyarev Date: Fri, 20 May 2022 16:37:40 +0700 Subject: [PATCH 3/8] add repo clickhouse, rm comments [skip-ci] --- .../clickhouse/tasks/os/CentOS_7/main.yml | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) 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 14ca2d5e02..0b91b4a30c 100644 --- a/ansible/system_roles/clickhouse/tasks/os/CentOS_7/main.yml +++ b/ansible/system_roles/clickhouse/tasks/os/CentOS_7/main.yml @@ -5,20 +5,7 @@ creates: /etc/yum.repos.d/clickhouse.repo environment: http_proxy: "{{ http_proxy }}" - https_proxy: "{{ http_proxy }} - - # yum_repository: - # name: clickhouse - # description: Clickhouse Official repo - # baseurl: https://packages.clickhouse.com/rpm/clickhouse.repo - # reposdir: /etc/yum.repos.d/ - # gpgcheck: "False" - # enabled: "True" - # environment: - # http_proxy: "{{ http_proxy }}" - # https_proxy: "{{ http_proxy }}" - # tags: - # - repo + https_proxy: "{{ http_proxy }}" - name: Install CH yum: -- GitLab From b7b8319309a3bea0b81fd36d25c678a68e39ce6b Mon Sep 17 00:00:00 2001 From: YuriyDegtyarev Date: Fri, 20 May 2022 17:05:09 +0700 Subject: [PATCH 4/8] change version ch [skip-ci] --- ansible/system_roles/clickhouse/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- GitLab From b5c43a456a7ac70bb90c12a96d3092f52ea1f03a Mon Sep 17 00:00:00 2001 From: YuriyDegtyarev Date: Fri, 20 May 2022 17:37:26 +0700 Subject: [PATCH 5/8] add repo ch for debian family [skip-ci] --- .../clickhouse/tasks/os/Debian_9/main.yml | 4 ++-- .../clickhouse/tasks/os/OracleLinux_7/main.yml | 11 +++-------- .../clickhouse/tasks/os/RedHat_7/main.yml | 11 +++-------- 3 files changed, 8 insertions(+), 18 deletions(-) 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..0b91b4a30c 100644 --- a/ansible/system_roles/clickhouse/tasks/os/OracleLinux_7/main.yml +++ b/ansible/system_roles/clickhouse/tasks/os/OracleLinux_7/main.yml @@ -1,16 +1,11 @@ --- - name: Add CH repository - yum_repository: - name: clickhouse - description: Clickhouse Official repo - baseurl: https://repo.yandex.ru/clickhouse/rpm/stable/x86_64 - gpgcheck: "False" - enabled: "True" + shell: yum-config-manager --add-repo=https://packages.clickhouse.com/rpm/clickhouse.repo + args: + creates: /etc/yum.repos.d/clickhouse.repo environment: http_proxy: "{{ http_proxy }}" https_proxy: "{{ http_proxy }}" - tags: - - repo - name: Install CH yum: 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..0b91b4a30c 100644 --- a/ansible/system_roles/clickhouse/tasks/os/RedHat_7/main.yml +++ b/ansible/system_roles/clickhouse/tasks/os/RedHat_7/main.yml @@ -1,16 +1,11 @@ --- - name: Add CH repository - yum_repository: - name: clickhouse - description: Clickhouse Official repo - baseurl: https://repo.yandex.ru/clickhouse/rpm/stable/x86_64 - gpgcheck: "False" - enabled: "True" + shell: yum-config-manager --add-repo=https://packages.clickhouse.com/rpm/clickhouse.repo + args: + creates: /etc/yum.repos.d/clickhouse.repo environment: http_proxy: "{{ http_proxy }}" https_proxy: "{{ http_proxy }}" - tags: - - repo - name: Install CH yum: -- GitLab From 343e64e8274be5d125c1260ff347310024afb38c Mon Sep 17 00:00:00 2001 From: YuriyDegtyarev Date: Fri, 20 May 2022 17:57:22 +0700 Subject: [PATCH 6/8] add repo ch for debian family --- 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/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 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) 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/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 e655d25df63c3a3f8be6ae078e25ec4d8b538933 Mon Sep 17 00:00:00 2001 From: YuriyDegtyarev Date: Fri, 20 May 2022 20:50:15 +0700 Subject: [PATCH 7/8] add repo ch for RH family [skip-ci] --- .../clickhouse/tasks/os/CentOS_7/main.yml | 11 ++++++++--- .../clickhouse/tasks/os/OracleLinux_7/main.yml | 11 ++++++++--- .../clickhouse/tasks/os/RedHat_7/main.yml | 9 ++++++--- 3 files changed, 22 insertions(+), 9 deletions(-) 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 0b91b4a30c..b0c4a0e6c7 100644 --- a/ansible/system_roles/clickhouse/tasks/os/CentOS_7/main.yml +++ b/ansible/system_roles/clickhouse/tasks/os/CentOS_7/main.yml @@ -1,11 +1,16 @@ --- - name: Add CH repository - shell: yum-config-manager --add-repo=https://packages.clickhouse.com/rpm/clickhouse.repo - args: - creates: /etc/yum.repos.d/clickhouse.repo + yum_repository: + name: clickhouse + description: Clickhouse Official repo + baseurl: https://packages.clickhouse.com/rpm/stable/ + gpgcheck: "False" + enabled: "True" environment: http_proxy: "{{ http_proxy }}" https_proxy: "{{ http_proxy }}" + tags: + - repo - name: Install CH yum: 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 0b91b4a30c..b0c4a0e6c7 100644 --- a/ansible/system_roles/clickhouse/tasks/os/OracleLinux_7/main.yml +++ b/ansible/system_roles/clickhouse/tasks/os/OracleLinux_7/main.yml @@ -1,11 +1,16 @@ --- - name: Add CH repository - shell: yum-config-manager --add-repo=https://packages.clickhouse.com/rpm/clickhouse.repo - args: - creates: /etc/yum.repos.d/clickhouse.repo + yum_repository: + name: clickhouse + description: Clickhouse Official repo + baseurl: https://packages.clickhouse.com/rpm/stable/ + gpgcheck: "False" + enabled: "True" environment: http_proxy: "{{ http_proxy }}" https_proxy: "{{ http_proxy }}" + tags: + - repo - name: Install CH yum: 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 0b91b4a30c..9e21fc0e7d 100644 --- a/ansible/system_roles/clickhouse/tasks/os/RedHat_7/main.yml +++ b/ansible/system_roles/clickhouse/tasks/os/RedHat_7/main.yml @@ -1,8 +1,11 @@ --- - name: Add CH repository - shell: yum-config-manager --add-repo=https://packages.clickhouse.com/rpm/clickhouse.repo - args: - creates: /etc/yum.repos.d/clickhouse.repo + yum_repository: + name: clickhouse + description: Clickhouse Official repo + baseurl: https://packages.clickhouse.com/rpm/stable/ + gpgcheck: "False" + enabled: "True" environment: http_proxy: "{{ http_proxy }}" https_proxy: "{{ http_proxy }}" -- GitLab From 40c9deb019870e3e16e959fde11a2366732ace9b Mon Sep 17 00:00:00 2001 From: YuriyDegtyarev Date: Fri, 20 May 2022 21:26:11 +0700 Subject: [PATCH 8/8] add repo ch for RH family --- ansible/system_roles/clickhouse/tasks/os/RedHat_7/main.yml | 2 ++ 1 file changed, 2 insertions(+) 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 9e21fc0e7d..b0c4a0e6c7 100644 --- a/ansible/system_roles/clickhouse/tasks/os/RedHat_7/main.yml +++ b/ansible/system_roles/clickhouse/tasks/os/RedHat_7/main.yml @@ -9,6 +9,8 @@ environment: http_proxy: "{{ http_proxy }}" https_proxy: "{{ http_proxy }}" + tags: + - repo - name: Install CH yum: -- GitLab