update dashboard init (#1226) (#1237)

* update dashboard init
pingcap · Mar 26, 2020 · cd51c5a · cd51c5a
1 parent 1ce164b
commit cd51c5a
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 15 deletions.
diff --git a/deploy.yml b/deploy.yml
@@ -187,9 +187,3 @@
   roles:
     - perf_tools
 
-- name: deploying init pd topo scripts
-  hosts: localhost
-  tags:
-    - always
-  roles:
-    - dashboard_topo
diff --git a/excessive_rolling_update.yml b/excessive_rolling_update.yml
@@ -570,6 +570,5 @@
 - hosts: localhost
   tags:
     - always
-  tasks:
-    - name: init pd topo
-      shell: "cd {{ playbook_dir }}/scripts && ./dashboard_topo.sh"
+  roles:
+    - { role: dashboard_topo }
diff --git a/roles/dashboard_topo/tasks/main.yml b/roles/dashboard_topo/tasks/main.yml
@@ -5,3 +5,8 @@
     src: "init_dashboard_topo.sh.j2"
     dest: "{{ playbook_dir }}/scripts/dashboard_topo.sh"
     mode: "0755"
+
+- name: init pd topo
+  shell: "./dashboard_topo.sh"
+  args:
+    chdir: "{{ playbook_dir }}/scripts"
diff --git a/rolling_update.yml b/rolling_update.yml
@@ -608,6 +608,5 @@
 - hosts: localhost
   tags:
     - always
-  tasks:
-    - name: init pd topo
-      shell: "cd {{ playbook_dir }}/scripts && ./dashboard_topo.sh"
+  roles:
+    - { role: dashboard_topo }
diff --git a/start.yml b/start.yml
@@ -563,6 +563,6 @@
 - hosts: localhost
   tags:
     - always
-  tasks:
-    - name: init dashboard topology
-      shell: "cd {{ playbook_dir }}/scripts && ./dashboard_topo.sh"
+  roles:
+    - { role: dashboard_topo }
+