#1001686 role变量改为defaults

playbooks/roles/filebeat/defaults/main.yml

@@ -1,2 +1,21 @@
 ---
-# defaults file for filebeat
+# vars file for filebeat
+filebeat_download_url: "https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-7.10.1-linux-x86_64.tar.gz"
+work_path: "/data/opt/filebeat/{{ instance_name }}"
+gwlogs:
+  - "api"
+  - "cl*"
+  - "doc"
+  - "download"
+  - "gw*"
+  - "cp*"
+  - "pay"
+  - "static"
+  - "81"
+mgrlogs: 
+  - "/data/game/htdocs/center/manager/storage/cp/logs/*.log"
+quicklog:
+  - "/data/game/sync/quick/filebeat/*.txt"
+config_files:
+  - "gateway-nginx"
+  - "manager"

playbooks/roles/filebeat/vars/main.yml

@@ -1,21 +0,0 @@
----
-# vars file for filebeat
-filebeat_download_url: "https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-7.10.1-linux-x86_64.tar.gz"
-work_path: "/data/opt/filebeat/{{ instance_name }}"
-gwlogs:
-  - "api"
-  - "cl*"
-  - "doc"
-  - "download"
-  - "gw*"
-  - "cp*"
-  - "pay"
-  - "static"
-  - "81"
-mgrlogs: 
-  - "/data/game/htdocs/center/manager/storage/cp/logs/*.log"
-quicklog:
-  - "/data/game/sync/quick/filebeat/*.txt"
-config_files:
-  - "gateway-nginx"
-  - "manager"

playbooks/roles/supervisor/defaults/main.yml

@@ -1,2 +1,9 @@
 ---
-# defaults file for supervisor
+# vars file for supervisor
+pip_bin_path: "/data/opt/python3/bin/pip"
+python_bin_dir: "/data/opt/python3/bin"
+work_path: "/data/opt/filebeat/{{ instance_name }}"
+filebeat_configs:
+  - "gateway-nginx"
+  - "manager"
+  - "quick"

playbooks/roles/supervisor/vars/main.yml

@@ -1,9 +0,0 @@
----
-# vars file for supervisor
-pip_bin_path: "/data/opt/python3/bin/pip"
-python_bin_dir: "/data/opt/python3/bin"
-work_path: "/data/opt/filebeat/{{ instance_name }}"
-filebeat_configs:
-  - "gateway-nginx"
-  - "manager"
-  - "quick"