playbook优化

.gitignore

@@ -5,3 +5,7 @@
 Goleaf.tar
 source/main
 playbook/node_modules/*
+build/*
+script/build/*
+script/dist/*
+script/__pycache__/*.pyc

playbook/goleaf-com.yml

@@ -1,8 +1,21 @@
 ---
 - name: Deploy GoLeaf release
-  hosts: google
+  hosts: london
   remote_user: root
+  vars:
+    goleaf_src: /data/devops/source/main
+    goleaf_dest: /data/devops/MergePet/main
 
+    config_src: /data/docs/tool/config/
+    config_dest: /data/devops/MergePet/config/
+
+    pack_script: /data/devops/pack.sh
+
+    tar_file: /usr/local/MergePet.tar
+
+    tar_dest: /usr/local/game
+
+    branch: develop
   tasks:
 
     # - name: copy
@@ -11,6 +24,10 @@
     #     dest: /usr/local
     # - name: tar
     #   command: tar -xvf /usr/local/Goleaf.tar -C /usr/local/
+    # - name: 切换分支 {{branch}}
+    #   shell: cd /codes/pet_home_server && git checkout {{branch}} && git pull
+    #   delegate_to: localhost
+    #   register: git_result
     # - name: sh pack.sh
     #   shell: sh /data/devops/pack.sh
     #   delegate_to: localhost
@@ -18,11 +35,12 @@
     # - name: copy goleaf
     #   copy:
     #     src: /data/devops/source/main
-    #     dest: /usr/local/Goleaf
+    #     dest: /usr/local/MergePet/main
     - name: copy goleaf
       copy:
-        src: /data/devops/MergePet/tool/tool
+        src: /data/devops/script/dist/verifyOrder
-        dest: /usr/local/game/tool/
+        dest: /usr/local/MergePet/script
+        mode: '0777'
 
     # - name: copy config
     #   copy:

playbook/goleaf-hwb.yml

@@ -14,16 +14,14 @@
 
   tasks:
     - name: stop goleaf
-      command: "{{ goleaf_dest }}/tool/tool stop node 5"
+      command: "{{ goleaf_dest }}/tool/tool stop node 1"
       register: stop_result
+      ignore_errors: yes
 
     - name: show stop_result
       debug:
         var: stop_result.stdout_lines
-    - name: change git branch
+
-      shell: cd /codes/pet_home_server && git checkout develop && git pull
-      delegate_to: localhost
-      register: git_result
     - name: sh pack.sh
       shell: sh /data/devops/pack.sh
       delegate_to: localhost
@@ -34,7 +32,7 @@
         dest: "{{goleaf_dest}}"
 
     - name: copy goleaf
-      command:  tar -cvf /usr/local/conf.tar  -C /data/docs/tool/out .
+      command:  tar -cvf /usr/local/conf.tar  -C /data/docs/tool/config .
       delegate_to: localhost
     - name: copy tar
       copy:
@@ -45,7 +43,7 @@
       
 
     - name: start goleaf
-      shell: nohup /usr/local/Goleaf/tool/tool start node 5 &
+      shell: nohup /usr/local/Goleaf/tool/tool start node 1 &
       register: restart_result
 
     - name: show restart result

playbook/merge_pet_install.yml

@@ -1,12 +1,12 @@
 ---
 - name: Deploy GoLeaf release
-  hosts: london
+  hosts: zone1
   remote_user: root
   vars:
     goleaf_src: /data/devops/source/main
     goleaf_dest: /data/devops/MergePet/main
 
-    config_src: /data/docs/tool/out/
+    config_src: /data/docs/tool/config/
     config_dest: /data/devops/MergePet/config/
 
     pack_script: /data/devops/pack.sh

playbook/merge_pet_london.yml

@@ -43,17 +43,11 @@
       copy:
         src: /data/docs/tool/conf.tar
         dest: "{{ tar_file }}"
-    # - name : untar
+
-    #   command: tar -xvf /usr/local/game/conf.tar -C /usr/local/game/gamedata/config/
     - unarchive:
         src: "{{ tar_file }}"
         dest: "{{ tar_dest }}"
         remote_src: yes
+        extra_opts: [--overwrite]
 
-    # - name: start goleaf
-    #   command: "nohup {{ goleaf_dest }}/tool/tool start node 1 &"
-    #   register: restart_result
 
-    # - name: show restart result
-    #   debug:
-    #     var: restart_result.stdout_lines

playbook/merge_pet_online.yml

@@ -19,10 +19,7 @@
     - name: sh pack.sh
       shell: sh /data/devops/pack.sh
       delegate_to: localhost
-    # - name: stop goleaf
+
-    #   command: "{{ goleaf_dest }}/tool/tool stop node 1"
-    #   register: stop_result
-    #   ignore_errors: yes
 
     - name: copy goleaf
       copy:
@@ -45,17 +42,10 @@
       copy:
         src: /data/docs/tool/conf.tar
         dest: /usr/local/game
-    # - name : untar
+
-    #   command: tar -xvf /usr/local/game/conf.tar -C /usr/local/game/gamedata/config/
     - unarchive:
         src: /usr/local/game/conf.tar
         dest: /usr/local/game/gamedata/config
         remote_src: yes
+        extra_opts: [--overwrite]
 
-    # - name: start goleaf
-    #   command: "nohup {{ goleaf_dest }}/tool/tool start node 1 &"
-    #   register: restart_result
-
-    # - name: show restart result
-    #   debug:
-    #     var: restart_result.stdout_lines

playbook/merge_pet_sdk.yml

@@ -6,19 +6,14 @@
   vars:
     goleaf_src: /data/devops/source/main
     goleaf_dest: /usr/local/games/MergePet
-    config_src: /data/docs/tool/out/
+    config_src: /data/docs/tool/config/
     config_dest: /usr/local/games/MergePet/gamedata/config/
     pack_script: /data/devops/pack.sh
 
   tasks:
-    # - name: stop goleaf
-    #   command: "{{ goleaf_dest }}/tool/tool stop node 1"
-    #   register: stop_result
-    #   ignore_errors: yes
 
-    - name: show stop_result
+
-      debug:
+
-        var: stop_result.stdout_lines
     - name: change git branch
       shell: cd /codes/pet_home_server && git checkout sdk && git pull
       delegate_to: localhost
@@ -48,20 +43,10 @@
     - name: copy tar
       copy:
         src: /data/docs/tool/conf.tar
-        dest: /usr/local/games/MergePet
+        dest: /usr/local/games/MergePet/conf.tar
     - unarchive:
         src: /usr/local/games/MergePet/conf.tar
         dest: /usr/local/games/MergePet/config/
         remote_src: yes
+        extra_opts: [--overwrite]
 
-    # - name : untar
-    #   command: tar -xvf /usr/local/games/MergePet/conf.tar -C /usr/local/games/MergePet/config/
-      
-
-    # - name: start goleaf
-    #   shell: nohup /usr/local/games/MergePet/tool/tool start node 1 &
-    #   register: restart_result
-
-    # - name: show restart result
-    #   debug:
-    #     var: restart_result.stdout_lines

playbook/merge_pet_test.yml

@@ -13,14 +13,7 @@
     tar_dest: /usr/local/Goleaf
 
   tasks:
-    - name: stop goleaf
-      command: "{{ goleaf_dest }}/tool/tool stop node 1"
-      register: stop_result
-      ignore_errors: yes
 
-    - name: show stop_result
-      debug:
-        var: stop_result.stdout_lines
     - name: change git branch
       shell: cd /codes/pet_home_server && git checkout develop && git pull
       delegate_to: localhost
@@ -38,9 +31,7 @@
       shell: cd /data/docs && git pull && python3 /data/docs/tool/cfg/tool_cfg_json.py
       delegate_to: localhost
 
-    # - name: tar config
+
-    #   command:  tar -cvf /usr/local/conf.tar  -C /data/docs/tool/out .
-    #   delegate_to: localhost
     - name: archive config
       archive:
         path: /data/docs/tool/config/
@@ -56,14 +47,4 @@
         src: /usr/local/Goleaf/conf.tar
         dest: /usr/local/Goleaf/config/
         remote_src: yes
-    # - name : untar
+        extra_opts: [--overwrite]
-    #   command: tar -xvf /usr/local/Goleaf/conf.tar -C /usr/local/Goleaf/config/
-      
-
-    - name: start goleaf
-      shell: nohup /usr/local/Goleaf/tool/tool start node 1 &
-      register: restart_result
-
-    - name: show restart result
-      debug:
-        var: restart_result.stdout_lines