ansible: fix grep error when check package exist before install

opencurve · Apr 23, 2021 · 1c0e9e0 · 1c0e9e0
1 parent f888010
commit 1c0e9e0
Show file tree

Hide file tree

Showing 6 changed files with 72 additions and 18 deletions.
diff --git a/curve-ansible/roles/install_package/tasks/include/install_curve-chunkserver.yml b/curve-ansible/roles/install_package/tasks/include/install_curve-chunkserver.yml
@@ -17,8 +17,14 @@
 
 - name: install libunwind
   vars:
-    apt_lib_name: libunwind8 libunwind8-dev
-    yum_lib_name: libunwind libunwind-devel
+    apt_lib_name: libunwind8
+    yum_lib_name: libunwind
+  include_tasks: common_tasks/install_with_yum_apt.yml
+
+- name: install libunwind-dev
+  vars:
+    apt_lib_name: libunwind8-dev
+    yum_lib_name: libunwind-devel
   include_tasks: common_tasks/install_with_yum_apt.yml
 
 - name: install bzip2

diff --git a/curve-ansible/roles/install_package/tasks/include/install_curve-mds.yml b/curve-ansible/roles/install_package/tasks/include/install_curve-mds.yml
@@ -17,14 +17,26 @@
 
 - name: install libunwind
   vars:
-    apt_lib_name: libunwind8 libunwind8-dev
-    yum_lib_name: libunwind libunwind-devel
+    apt_lib_name: libunwind8
+    yum_lib_name: libunwind
+  include_tasks: common_tasks/install_with_yum_apt.yml
+
+- name: install libunwind-dev
+  vars:
+    apt_lib_name: libunwind8-dev
+    yum_lib_name: libunwind-devel
   include_tasks: common_tasks/install_with_yum_apt.yml
 
 - name: install libuuid
   vars:
-    apt_lib_name: libuuid1 uuid-dev
-    yum_lib_name: libuuid libuuid-devel
+    apt_lib_name: libuuid1
+    yum_lib_name: libuuid
+  include_tasks: common_tasks/install_with_yum_apt.yml
+
+- name: install libuuid-dev
+  vars:
+    apt_lib_name: uuid-dev
+    yum_lib_name: libuuid-devel
   include_tasks: common_tasks/install_with_yum_apt.yml
 
 - name: install daemon

diff --git a/curve-ansible/roles/install_package/tasks/include/install_curve-nbd.yml b/curve-ansible/roles/install_package/tasks/include/install_curve-nbd.yml
@@ -17,14 +17,26 @@
 
 - name: install libunwind
   vars:
-    apt_lib_name: libunwind8 libunwind8-dev
-    yum_lib_name: libunwind libunwind-devel
+    apt_lib_name: libunwind8
+    yum_lib_name: libunwind
+  include_tasks: common_tasks/install_with_yum_apt.yml
+
+- name: install libunwind-dev
+  vars:
+    apt_lib_name: libunwind8-dev
+    yum_lib_name: libunwind-devel
   include_tasks: common_tasks/install_with_yum_apt.yml
 
 - name: install libnl
   vars:
-    apt_lib_name: libnl-3-dev libnl-genl-3-dev
-    yum_lib_name: libnl3 libnl3-devel
+    apt_lib_name: libnl-3-dev
+    yum_lib_name: libnl3
+  include_tasks: common_tasks/install_with_yum_apt.yml
+
+- name: install libnl-dev
+  vars:
+    apt_lib_name: libnl-genl-3-dev
+    yum_lib_name: libnl3-devel
   include_tasks: common_tasks/install_with_yum_apt.yml
 
 - name: install nbd bin

diff --git a/curve-ansible/roles/install_package/tasks/include/install_curve-sdk.yml b/curve-ansible/roles/install_package/tasks/include/install_curve-sdk.yml
@@ -17,8 +17,14 @@
 
 - name: install libunwind
   vars:
-    apt_lib_name: libunwind8 libunwind8-dev
-    yum_lib_name: libunwind libunwind-devel
+    apt_lib_name: libunwind8
+    yum_lib_name: libunwind
+  include_tasks: common_tasks/install_with_yum_apt.yml
+
+- name: install libunwind-dev
+  vars:
+    apt_lib_name: libunwind8-dev
+    yum_lib_name: libunwind-devel
   include_tasks: common_tasks/install_with_yum_apt.yml
 
 - name: install curve-sdk bin

diff --git a/curve-ansible/roles/install_package/tasks/include/install_curve-snapshotcloneserver.yml b/curve-ansible/roles/install_package/tasks/include/install_curve-snapshotcloneserver.yml
@@ -17,16 +17,28 @@
 
 - name: install libunwind
   vars:
-    apt_lib_name: libunwind8 libunwind8-dev
-    yum_lib_name: libunwind libunwind-devel
+    apt_lib_name: libunwind8
+    yum_lib_name: libunwind
+  include_tasks: common_tasks/install_with_yum_apt.yml
+
+- name: install libunwind-dev
+  vars:
+    apt_lib_name: libunwind8-dev
+    yum_lib_name: libunwind-devel
   include_tasks: common_tasks/install_with_yum_apt.yml
 
 - name: install libuuid
   vars:
-    apt_lib_name: libuuid1 uuid-dev
-    yum_lib_name: libuuid libuuid-devel
+    apt_lib_name: libuuid1
+    yum_lib_name: libuuid
   include_tasks: common_tasks/install_with_yum_apt.yml
 
+- name: install libuuid-dev
+  vars:
+    apt_lib_name: uuid-dev
+    yum_lib_name: libuuid-devel
+  include_tasks: common_tasks/install_with_yum_apt.yml  
+
 - name: install daemon
   include_tasks: install_daemon.yml
 

diff --git a/curve-ansible/roles/install_package/tasks/include/install_nebd.yml b/curve-ansible/roles/install_package/tasks/include/install_nebd.yml
@@ -17,8 +17,14 @@
 
 - name: install libunwind
   vars:
-    apt_lib_name: libunwind8 libunwind8-dev
-    yum_lib_name: libunwind libunwind-devel
+    apt_lib_name: libunwind8
+    yum_lib_name: libunwind
+  include_tasks: common_tasks/install_with_yum_apt.yml
+
+- name: install libunwind-dev
+  vars:
+    apt_lib_name: libunwind8-dev
+    yum_lib_name: libunwind-devel
   include_tasks: common_tasks/install_with_yum_apt.yml
 
 - name: install bzip2