ansible: fix tag error

heymingwei · Apr 27, 2021 · 7c70577 · 7c70577
1 parent 91cf0d7
commit 7c70577
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/curve-ansible/deploy_curve.yml b/curve-ansible/deploy_curve.yml
@@ -127,9 +127,9 @@
     - { role: generate_config, template_name: chunkserver.conf, conf_path: "{{ chunkserver_conf_path }}",
                 tags: ["generate_config", "generage_chunkserver_conf"] }
     - { role: generate_config, template_name: client.conf, conf_path: "{{ chunkserver_client_config_path }}",
-                tags: ["generate_config", "generage_chunkserver_conf"] }
+                tags: ["generate_config", "generage_chunkserver_client_conf"] }
     - { role: generate_config, template_name: s3.conf, conf_path: "{{ chunkserver_s3_config_path }}",
-                tags: ["generate_config", "generage_s3_conf"] }
+                tags: ["generate_config", "generage_cs_s3_conf"] }
 
 - name: start chunkserver
   hosts: chunkservers
@@ -169,7 +169,7 @@
     - { role: generate_config, template_name: client.conf, conf_path: "{{ snap_client_config_path }}",
             tags: ["generate_config", "generate_snap_client_conf"] }
     - { role: generate_config, template_name: s3.conf, conf_path: "{{ snap_s3_config_path }}",
-                tags: ["generate_config", "generage_s3_conf"] }
+                tags: ["generate_config", "generage_snap_s3_conf"] }
 
 - name: start snapshotcloneserver
   hosts: snapshotclone

diff --git a/...e-ansible/roles/format_chunkserver/tasks/include/prepare_chunkserver_with_disk_format.yml b/...e-ansible/roles/format_chunkserver/tasks/include/prepare_chunkserver_with_disk_format.yml
@@ -25,4 +25,4 @@
   shell: sudo ./chunkserver_ctl.sh deploy-wal-pool all --noConfirm
   async: 0
   poll: 3
-  when: not retain_pool | bool and not walfilepool_use_chunk_file_pool | bool
+  when: (not retain_pool | bool) and (not walfilepool_use_chunk_file_pool | bool)
diff --git a/curve-ansible/rolling_update_curve.yml b/curve-ansible/rolling_update_curve.yml
@@ -133,7 +133,7 @@
     - { role: generate_config, template_name: client.conf, conf_path: "{{ chunkserver_client_config_path }}",
                 tags: ["generate_config", "generage_chunkserver_client_conf"] }
     - { role: generate_config, template_name: s3.conf, conf_path: "{{ chunkserver_s3_config_path }}",
-                tags: ["generate_config", "generage_s3_conf"] }
+                tags: ["generate_config", "generage_cs_s3_conf"] }
 
 # 逐个重启chunkserver，每重启完一个需要等待copyset健康
 # 继续操作下一个的的时候还需要一个命令行交互确认
@@ -175,7 +175,7 @@
     - { role: generate_config, template_name: client.conf, conf_path: "{{ snap_client_config_path }}",
             tags: ["generate_config", "generate_snap_client_conf"] }
     - { role: generate_config, template_name: s3.conf, conf_path: "{{ snap_s3_config_path }}",
-                tags: ["generate_config", "generage_s3_conf"] }
+                tags: ["generate_config", "generage_snap_s3_conf"] }
 
 - name: set leader and follower list
   hosts: snapshotclone