update config check 3.0 (#972)

* Update disk space check modle (#937) * Update config check (#971)
pingcap · Sep 24, 2019 · 8b63298 · 8b63298
1 parent b145266
commit 8b63298
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 21 deletions.
diff --git a/roles/check_config/tasks/check_pd_config.yml b/roles/check_config/tasks/check_pd_config.yml
@@ -1,19 +1,19 @@
 ---
 
 - name: Load PD vars
-  include_vars: file={{ playbook_dir }}/roles/pd/defaults/main.yml
+  include_vars: file={{ playbook_dir }}/roles/pd/defaults/main.yml name=pd_vars_check
 
 - name: "Load customized config: tidb-ansible/conf/pd.yml"
-  include_vars: file={{ playbook_dir }}/conf/pd.yml name=pd_conf_custom
+  include_vars: file={{ playbook_dir }}/conf/pd.yml name=pd_conf_custom_check
 
 - name: Load default config
-  include_vars: file={{ playbook_dir }}/roles/pd/vars/default.yml name=pd_conf_default
+  include_vars: file={{ playbook_dir }}/roles/pd/vars/default.yml name=pd_conf_default_check
 
 - name: Generate dynamic config
   set_fact:
-    pd_conf_generated:
+    pd_conf_generated_check:
       replication:
-        location-labels: "{{ location_labels }}"
+        location-labels: "{{ pd_vars_check.location_labels }}"
       security:
         cacert-path: >-
           {%- if enable_tls|default(false) -%}{{ pd_cert_dir }}/ca.pem{%- else -%}{%- endif -%}
@@ -24,11 +24,10 @@
 
 - name: Generate final config
   set_fact:
-    pd_conf: "{{ pd_conf_custom | with_default_dicts(pd_conf_generated, pd_conf_default) }}"
+    pd_conf: "{{ pd_conf_custom_check | with_default_dicts(pd_conf_generated_check, pd_conf_default_check) }}"
 
 - name: Create configuration file
   template: src={{ playbook_dir }}/roles/pd/templates/pd.toml.j2 dest={{ tidb_check_dir }}/pd.toml mode=0644 backup=yes
-  register: pd_conf_st
 
 - name: Deploy PD binary
   copy: src="{{ resources_dir }}/bin/pd-server" dest="{{ tidb_check_dir }}/" mode=0755 backup=yes

diff --git a/roles/check_config/tasks/check_tidb_config.yml b/roles/check_config/tasks/check_tidb_config.yml
@@ -1,17 +1,20 @@
 ---
 
-- name: Load TiDB vars
-  include_vars: file={{ playbook_dir }}/roles/tidb/defaults/main.yml
+- name: Load TiDB default vars
+  include_vars: file={{ playbook_dir }}/roles/tidb/defaults/main.yml name=tidb_vars_check
+
+- name: Load TiDB group vars
+  include_vars: file={{ playbook_dir }}/group_vars/tidb_servers.yml name=tidb_vars_check
 
 - name: "Load customized config: tidb-ansible/conf/tidb.yml"
-  include_vars: file={{ playbook_dir }}/conf/tidb.yml name=tidb_conf_custom
+  include_vars: file={{ playbook_dir }}/conf/tidb.yml name=tidb_conf_custom_check
 
 - name: Load default config
-  include_vars: file={{ playbook_dir }}/roles/tidb/vars/default.yml name=tidb_conf_default
+  include_vars: file={{ playbook_dir }}/roles/tidb/vars/default.yml name=tidb_conf_default_check
 
 - name: generate dynamic config
   set_fact:
-    tidb_conf_generated:
+    tidb_conf_generated_check:
       security:
         cluster-ssl-ca: >-
           {%- if enable_tls|default(false) -%}{{ tidb_cert_dir }}/ca.pem{%- else -%}{%- endif -%}
@@ -22,7 +25,7 @@
 
 - name: Generate final config
   set_fact:
-    tidb_conf: "{{ tidb_conf_custom | with_default_dicts(tidb_conf_generated, tidb_conf_default) }}"
+    tidb_conf: "{{ tidb_conf_custom_check | with_default_dicts(tidb_conf_generated_check, tidb_conf_default_check) }}"
 
 - name: Create configuration file
   template: src={{ playbook_dir }}/roles/tidb/templates/tidb.toml.j2 dest={{ tidb_check_dir }}/tidb.toml mode=0644 backup=yes

diff --git a/roles/check_config/tasks/check_tikv_config.yml b/roles/check_config/tasks/check_tikv_config.yml
@@ -1,23 +1,26 @@
 ---
 
+- set_fact:
+    tikv_log_dir: "{{ deploy_dir }}/log"
+
 - name: Load TiKV vars
-  include_vars: file={{ playbook_dir }}/roles/tikv/defaults/main.yml
+  include_vars: file={{ playbook_dir }}/roles/tikv/defaults/main.yml name=tikv_vars_check
 
 - name: "Load customized config: tidb-ansible/conf/tikv.yml"
-  include_vars: file={{ playbook_dir }}/conf/tikv.yml name=tikv_conf_custom
+  include_vars: file={{ playbook_dir }}/conf/tikv.yml name=tikv_conf_custom_check
 
 - name: Load default config
-  include_vars: file={{ playbook_dir }}/roles/tikv/vars/default.yml name=tikv_conf_default
+  include_vars: file={{ playbook_dir }}/roles/tikv/vars/default.yml name=tikv_conf_default_check
 
 - name: generate dynamic config
   set_fact:
-    tikv_conf_generated:
+    tikv_conf_generated_check:
       server:
-        labels: "{{ labels }}"
+        labels: "{{ tikv_vars_check.labels }}"
       rocksdb:
-        wal-dir: "{{ wal_dir }}"
+        wal-dir: "{{ tikv_vars_check.wal_dir }}"
       raftstore:
-        raftdb-path: "{{ raftdb_path }}"
+        raftdb-path: "{{ tikv_vars_check.raftdb_path }}"
       security:
         ca-path: >-
           {%- if enable_tls|default(false) -%}{{ tikv_cert_dir }}/ca.pem{%- else -%}{%- endif -%}
@@ -28,7 +31,7 @@
 
 - name: Generate final config
   set_fact:
-    tikv_conf: "{{ tikv_conf_custom | with_default_dicts(tikv_conf_generated, tikv_conf_default) }}"
+    tikv_conf: "{{ tikv_conf_custom_check | with_default_dicts(tikv_conf_generated_check, tikv_conf_default_check) }}"
 
 - name: Create configuration file
   template: src={{ playbook_dir }}/roles/tikv/templates/tikv.toml.j2 dest={{ tidb_check_dir }}/tikv.toml mode=0644 backup=yes