ansible: fixed some ansible bugs

Wine93 · ilixiaocui · commit 5d1533447f12 · 2021-06-10T11:13:04.000+08:00
diff --git a/conf/chunkserver.conf.example b/conf/chunkserver.conf.example
@@ -75,7 +75,7 @@ copyset.catchup_margin=1000
 # copyset chunk数据目录
 copyset.chunk_data_uri=local://./0/copysets
 # raft wal log目录
-copyset.raft_log_uri=local://./0/copysets
+copyset.raft_log_uri=curve://./0/copysets
 # raft元数据目录
 copyset.raft_meta_uri=local://./0/copysets
 # raft snapshot目录
diff --git a/curve-ansible/client.ini b/curve-ansible/client.ini
@@ -36,3 +36,6 @@ wait_service_timeout=20
 curve_bin_dir=/usr/bin
 start_by_daemon=true
 install_with_deb=false
+sudo_or_not=True
+ansible_become_user=curve
+ansible_become_flags=-iu curve
diff --git a/curve-ansible/common_tasks/check_if_nbd_exists_in_kernel.yml b/curve-ansible/common_tasks/check_if_nbd_exists_in_kernel.yml
@@ -16,7 +16,7 @@
 #
 
 - name: check if nbd exists in kernel
-  shell: /sbin/modprobe nbd
+  shell: sudo /sbin/modprobe nbd
   ignore_errors: true
   register: modprobe_res
 
diff --git a/curve-ansible/deploy_curve.yml b/curve-ansible/deploy_curve.yml
@@ -199,12 +199,20 @@
   hosts: snapshotclone_nginx
   any_errors_fatal: true
   gather_facts: no
+  become: "{{ sudo_or_not | bool }}"
   tags:
     - snapshotclone_nginx
     - never
   roles:
-    - { role: install_package, package_name: curve-snapshotcloneserver-nginx,
-            tags: ["install_conf_package", "install_snapshotclone_nginx_conf_package"] }
+    - {
+        role: install_package,
+        package_name: curve-snapshotcloneserver-nginx,
+        package_version: "{{ snapshot_nginx_package_version }}",
+        tags: [
+            "install_conf_package",
+            "install_snapshotclone_nginx_conf_package"
+        ]
+      }
     - { role: generate_config, template_name: nginx.conf, conf_path: "{{ snapshot_nginx_conf_path }}",
             tags: ["generate_config", "generate_snap_nginx_conf"] }
     - { role: generate_config, template_name: nginx_config.lua, conf_path: "{{ snapshot_nginx_lua_conf_path}}",
diff --git a/curve-ansible/deploy_curve_sdk.yml b/curve-ansible/deploy_curve_sdk.yml
@@ -25,6 +25,7 @@
   hosts: client
   any_errors_fatal: true
   gather_facts: no
+  become: "{{ sudo_or_not | bool }}"
   tags:
     - prepare_software_env
   roles:
@@ -34,6 +35,7 @@
   hosts: client
   gather_facts: no
   any_errors_fatal: true
+  become: "{{ sudo_or_not | bool }}"
   tags:
     - prepare
   vars:
@@ -44,4 +46,4 @@
     - { role: install_package, package_name: curve-sdk, package_version: "{{ sdk_package_version }}",
             tags: install_package }
     - { role: generate_config, template_name: client.conf, conf_path: "{{ py_client_config_path }}",
-            tags: generate_config }
+            tags: generate_config }
diff --git a/curve-ansible/deploy_nbd.yml b/curve-ansible/deploy_nbd.yml
@@ -25,6 +25,7 @@
   hosts: client
   any_errors_fatal: true
   gather_facts: yes
+  become: "{{ sudo_or_not | bool }}"
   tags:
     - check_kernel_version
   tasks:
@@ -39,6 +40,7 @@
   hosts: client
   any_errors_fatal: true
   gather_facts: no
+  become: "{{ sudo_or_not | bool }}"
   tags:
     - prepare_software_env
   roles:
@@ -48,6 +50,7 @@
   hosts: client
   gather_facts: no
   any_errors_fatal: true
+  become: "{{ sudo_or_not | bool }}"
   tags:
     - prepare
   roles:
diff --git a/curve-ansible/deploy_nebd.yml b/curve-ansible/deploy_nebd.yml
@@ -25,6 +25,7 @@
   hosts: client
   any_errors_fatal: true
   gather_facts: no
+  become: "{{ sudo_or_not | bool }}"
   tags:
     - prepare_software_env
   roles:
@@ -34,6 +35,7 @@
   hosts: client
   gather_facts: no
   any_errors_fatal: true
+  become: "{{ sudo_or_not | bool }}"
   tags:
     - prepare
   roles:
diff --git a/curve-ansible/roles/generate_config/defaults/main.yml b/curve-ansible/roles/generate_config/defaults/main.yml
@@ -117,9 +117,9 @@ chunkserver_copyset_election_timeout_ms: 1000
 chunkserver_copyset_snapshot_interval_s: 1800
 chunkserver_copyset_catchup_margin: 1000
 chunkserver_copyset_chunk_data_uri: local://./0/copysets
-chunkserver_copyset_raft_log_uri: local://./0/copysets
+chunkserver_copyset_raft_log_uri: curve://./0/copysets
 chunkserver_copyset_raft_meta_uri: local://./0/copysets
-chunkserver_copyset_raft_snapshot_uri: local://./0/copysets
+chunkserver_copyset_raft_snapshot_uri: curve://./0/copysets
 chunkserver_copyset_recycler_uri: local://./0/recycler
 chunkserver_copyset_max_inflight_requests: 5000
 chunkserver_copyset_load_concurrency: 10
diff --git a/curve-ansible/roles/install_package/templates/chunkserver_ctl.sh.j2 b/curve-ansible/roles/install_package/templates/chunkserver_ctl.sh.j2
@@ -162,7 +162,7 @@ function start_one() {
             -chunkServerStoreUri=local://${dataDir}/chunkserver$1/ \
             -copySetUri=local://${dataDir}/chunkserver$1/copysets \
             -raftSnapshotUri=curve://${dataDir}/chunkserver$1/copysets \
-            -raftLogUri=local://${dataDir}/chunkserver$1/copysets \
+            -raftLogUri=curve://${dataDir}/chunkserver$1/copysets \
             -recycleUri=local://${dataDir}/chunkserver$1/recycler \
             -raft_sync_segments=true \
             -graceful_quit_on_sigterm=true \
diff --git a/curve-ansible/rolling_update_curve_sdk.yml b/curve-ansible/rolling_update_curve_sdk.yml
@@ -25,6 +25,7 @@
   hosts: client
   gather_facts: no
   any_errors_fatal: true
+  become: "{{ sudo_or_not | bool }}"
   tags:
     - prepare
   roles:
diff --git a/curve-ansible/rolling_update_nbd.yml b/curve-ansible/rolling_update_nbd.yml
@@ -25,6 +25,7 @@
   hosts: client
   gather_facts: no
   any_errors_fatal: true
+  become: "{{ sudo_or_not | bool }}"
   tags:
     - prepare
   roles:
diff --git a/curve-ansible/rolling_update_nebd.yml b/curve-ansible/rolling_update_nebd.yml
@@ -25,6 +25,7 @@
   hosts: client
   gather_facts: no
   any_errors_fatal: true
+  become: "{{ sudo_or_not | bool }}"
   tags:
     - prepare
   roles:
diff --git a/curve-ansible/server.ini b/curve-ansible/server.ini
@@ -104,6 +104,7 @@ retain_pool=False
 walfilepool_use_chunk_file_pool=True
 
 [snapshotclone_nginx:vars]
+snapshot_nginx_package_version="0.0.6.1.1+7af4d6a4"
 snapshotcloneserver_nginx_dir=/etc/curve/nginx
 snapshot_nginx_conf_path=/etc/curve/nginx/conf/nginx.conf
 snapshot_nginx_lua_conf_path=/etc/curve/nginx/app/etc/config.lua
diff --git a/curve-chunkserver/home/nbs/chunkserver_ctl.sh b/curve-chunkserver/home/nbs/chunkserver_ctl.sh
@@ -178,7 +178,7 @@ function start_one() {
             -chunkServerStoreUri=local:///data/chunkserver$1/ \
             -copySetUri=local:///data/chunkserver$1/copysets \
             -raftSnapshotUri=curve:///data/chunkserver$1/copysets \
-            -raftLogUri=local:///data/chunkserver$1/copysets \
+            -raftLogUri=curve:///data/chunkserver$1/copysets \
             -recycleUri=local:///data/chunkserver$1/recycler \
             -raft_sync_segments=true \
             -graceful_quit_on_sigterm=true \

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`#`
`17`	`17`
`18`	`18`	`- name: check if nbd exists in kernel`
`19`		`- shell: /sbin/modprobe nbd`
	`19`	`+ shell: sudo /sbin/modprobe nbd`
`20`	`20`	`ignore_errors: true`
`21`	`21`	`register: modprobe_res`
`22`	`22`