Update binlog (#920) (#921)

* Update binlog
pingcap · Aug 28, 2019 · bda5ac1 · bda5ac1
1 parent 0fa1019
commit bda5ac1
Show file tree

Hide file tree

Showing 17 changed files with 7 additions and 69 deletions.
diff --git a/conf/drainer-kafka.toml b/conf/drainer-kafka.toml
diff --git a/conf/drainer-cluster.toml → conf/drainer.toml b/conf/drainer-cluster.toml → conf/drainer.toml
diff --git a/conf/pump-cluster.yml → conf/pump.yml b/conf/pump-cluster.yml → conf/pump.yml
diff --git a/deploy_drainer.yml b/deploy_drainer.yml
@@ -43,7 +43,7 @@
   tags:
     - drainer
   roles:
-    - { role: drainer_cluster, when: enable_binlog|default(false) }
+    - { role: drainer, when: enable_binlog|default(false) }
 
 - name: finalizing deployment target
   hosts: all

diff --git a/roles/drainer_cluster/defaults/main.yml → roles/drainer/defaults/main.yml b/roles/drainer_cluster/defaults/main.yml → roles/drainer/defaults/main.yml
diff --git a/roles/drainer_cluster/files/make-ssl.sh → roles/drainer/files/make-ssl.sh b/roles/drainer_cluster/files/make-ssl.sh → roles/drainer/files/make-ssl.sh
diff --git a/roles/drainer_cluster/meta/main.yml → roles/drainer/meta/main.yml b/roles/drainer_cluster/meta/main.yml → roles/drainer/meta/main.yml
diff --git a/...ainer_cluster/tasks/binary_deployment.yml → roles/drainer/tasks/binary_deployment.yml b/...ainer_cluster/tasks/binary_deployment.yml → roles/drainer/tasks/binary_deployment.yml
diff --git a/roles/drainer_cluster/tasks/check_certs.yml → roles/drainer/tasks/check_certs.yml b/roles/drainer_cluster/tasks/check_certs.yml → roles/drainer/tasks/check_certs.yml
diff --git a/roles/drainer_cluster/tasks/gen_certs.yml → roles/drainer/tasks/gen_certs.yml b/roles/drainer_cluster/tasks/gen_certs.yml → roles/drainer/tasks/gen_certs.yml
diff --git a/...s/drainer_cluster/tasks/install_certs.yml → roles/drainer/tasks/install_certs.yml b/...s/drainer_cluster/tasks/install_certs.yml → roles/drainer/tasks/install_certs.yml
diff --git a/roles/drainer_cluster/tasks/main.yml → roles/drainer/tasks/main.yml b/roles/drainer_cluster/tasks/main.yml → roles/drainer/tasks/main.yml
@@ -5,16 +5,16 @@
   fail: msg="Please set initial_commit_ts variable for drainer server in inventory.ini."
   when: (initial_commit_ts is undefined) or (initial_commit_ts is defined and initial_commit_ts == "")
 
-- name: "check if the customized config file `{{ playbook_dir }}/conf/{{ inventory_hostname }}_drainer-cluster.toml` existed"
+- name: "check if the customized config file `{{ playbook_dir }}/conf/{{ inventory_hostname }}_drainer.toml` existed"
   delegate_to: localhost
   stat:
-    path: "{{ playbook_dir }}/conf/{{ inventory_hostname }}_drainer-cluster.toml"
+    path: "{{ playbook_dir }}/conf/{{ inventory_hostname }}_drainer.toml"
   register: drainer_customized_conf_st
 
-- name: "Preflight check - ensure that the customized config file `{{ playbook_dir }}/conf/{{ inventory_hostname }}_drainer-cluster.toml` exists"
+- name: "Preflight check - ensure that the customized config file `{{ playbook_dir }}/conf/{{ inventory_hostname }}_drainer.toml` exists"
   delegate_to: localhost
   fail:
-    msg: 'You need to create customized config file `{{ playbook_dir }}/conf/{{ inventory_hostname }}_drainer-cluster.toml`.'
+    msg: 'You need to create customized config file `{{ playbook_dir }}/conf/{{ inventory_hostname }}_drainer.toml`.'
   when: drainer_customized_conf_st.stat.exists == False
 
 - name: create deploy directories
@@ -34,7 +34,7 @@
 #   when: enable_tls|default(false)
 
 - name: create configuration file
-  copy: src="{{ playbook_dir }}/conf/{{ inventory_hostname }}_drainer-cluster.toml" dest="{{ deploy_dir }}/conf/drainer.toml" mode=0644 backup=yes
+  copy: src="{{ playbook_dir }}/conf/{{ inventory_hostname }}_drainer.toml" dest="{{ deploy_dir }}/conf/drainer.toml" mode=0644 backup=yes
   register: drainer_conf_st
 
 - name: backup conf file

diff --git a/...er_cluster/tasks/supervise_deployment.yml → roles/drainer/tasks/supervise_deployment.yml b/...er_cluster/tasks/supervise_deployment.yml → roles/drainer/tasks/supervise_deployment.yml
diff --git a/...iner_cluster/tasks/systemd_deployment.yml → roles/drainer/tasks/systemd_deployment.yml b/...iner_cluster/tasks/systemd_deployment.yml → roles/drainer/tasks/systemd_deployment.yml
diff --git a/...luster/templates/run_drainer_binary.sh.j2 → ...rainer/templates/run_drainer_binary.sh.j2 b/...luster/templates/run_drainer_binary.sh.j2 → ...rainer/templates/run_drainer_binary.sh.j2
diff --git a/roles/drainer_cluster/vars/default.yml → roles/drainer/vars/default.yml b/roles/drainer_cluster/vars/default.yml → roles/drainer/vars/default.yml
diff --git a/roles/pump/tasks/main.yml b/roles/pump/tasks/main.yml
@@ -18,7 +18,7 @@
   when: enable_tls|default(false)
 
 - name: load customized config
-  include_vars: file={{ playbook_dir }}/conf/pump-cluster.yml name=pump_conf_custom
+  include_vars: file={{ playbook_dir }}/conf/pump.yml name=pump_conf_custom
 
 - name: load default config
   include_vars: file=default.yml name=pump_conf_default