From 4b7160d60e3eef404b69816a1fcfb5bd240ad75f Mon Sep 17 00:00:00 2001
From: jianlong <jianlong.zhang@baifendian.com>
Date: Wed, 1 Sep 2021 15:23:46 +0800
Subject: [PATCH] =?UTF-8?q?clickhouse=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9=201.=20=E5=8E=BB=E6=8E=89=E5=86=B7=E7=83=AD?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 configurations/components.yml                             | 4 ----
 .../clickhouse/common/tasks/install_clickhouse.yml        | 8 ++++----
 .../components/clickhouse/common/templates/config.xml.j2  | 2 +-
 .../clickhouse/data/tasks/install_clickhouse.yml          | 6 +++---
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/configurations/components.yml b/configurations/components.yml
index 7540c54..6865007 100644
--- a/configurations/components.yml
+++ b/configurations/components.yml
@@ -171,7 +171,3 @@ galaxy_mariadb_port: 3306
 #mariadb 用户
 galaxy_mariadb_username: root
 
-#===========================Clickhouse===============================#
-#ssd磁盘挂载的目录, 如果没有ssd磁盘可选择一块普通磁盘, 路径后面的'/'不可省略
-clickhouse_ssd_path: /ssd_data/clickhouse/
-
diff --git a/parcels/roles/components/clickhouse/common/tasks/install_clickhouse.yml b/parcels/roles/components/clickhouse/common/tasks/install_clickhouse.yml
index cfecc83..351d9ad 100644
--- a/parcels/roles/components/clickhouse/common/tasks/install_clickhouse.yml
+++ b/parcels/roles/components/clickhouse/common/tasks/install_clickhouse.yml
@@ -64,10 +64,10 @@
   run_once: true
   delegate_to: 127.0.0.1
 
-- name: create clickhouse ssd data path:{{ clickhouse_ssd_path }}
-  file:
-    state: directory
-    path: '{{ clickhouse_ssd_path }}'
+#- name: create clickhouse ssd data path:{{ clickhouse_ssd_path }}
+#  file:
+#    state: directory
+#    path: '{{ clickhouse_ssd_path }}'
 
 - name: create clickhouse package path:{{ install_path }}/clickhouse
   file:
diff --git a/parcels/roles/components/clickhouse/common/templates/config.xml.j2 b/parcels/roles/components/clickhouse/common/templates/config.xml.j2
index 3366c88..32e266f 100644
--- a/parcels/roles/components/clickhouse/common/templates/config.xml.j2
+++ b/parcels/roles/components/clickhouse/common/templates/config.xml.j2
@@ -371,7 +371,7 @@
     <storage_configuration>
         <disks>
             <ssd>
-              <path>{{ clickhouse_ssd_path }}</path>
+              <path>if you want wo use this policies, please config the ssd mount path</path>
             </ssd>
         </disks>
 
diff --git a/parcels/roles/components/clickhouse/data/tasks/install_clickhouse.yml b/parcels/roles/components/clickhouse/data/tasks/install_clickhouse.yml
index 47dd7b4..cb706fa 100644
--- a/parcels/roles/components/clickhouse/data/tasks/install_clickhouse.yml
+++ b/parcels/roles/components/clickhouse/data/tasks/install_clickhouse.yml
@@ -37,9 +37,9 @@
     - { file: 'clickhouse-client-{{ clickhouse_version }}-1.el7.x86_64' }
   when: odbc_install.stdout != '0' and inventory_hostname != (groups.clickhouse[0]) and inventory_hostname != (groups.clickhouse[1])
 
-- name: set dir user
-  shell: chown clickhouse:clickhouse -R {{ data_path }}/clickhouse/ && chown clickhouse:clickhouse -R {{ clickhouse_ssd_path }}
-  when: inventory_hostname != (groups.clickhouse[0]) and inventory_hostname != (groups.clickhouse[1])
+#- name: set dir user
+#  shell: chown clickhouse:clickhouse -R {{ data_path }}/clickhouse/ && chown clickhouse:clickhouse -R {{ clickhouse_ssd_path }}
+#  when: inventory_hostname != (groups.clickhouse[0]) and inventory_hostname != (groups.clickhouse[1])
 
 - name: copy clickhouse-server to /etc/init.d/
   shell: yes | cp -r {{ data_path }}/clickhouse/clickhouse-server/clickhouse-server /etc/init.d/clickhouse-server