Fix some bugs about ansible deployment

[stor4nfv.git] / ci / ansible / roles / common / tasks / main.yml

diff --git a/ci/ansible/roles/common/tasks/main.yml b/ci/ansible/roles/common/tasks/main.yml
index daee059..4137812 100644 (file)
--- a/ci/ansible/roles/common/tasks/main.yml
+++ b/ci/ansible/roles/common/tasks/main.yml
@@ -31,8 +31,8 @@
   apt:\r
     update_cache: yes\r
 \r
-- name: install make, gcc and pip external packages\r
-  apt:\r
+- name: install system packages\r
+  package:\r
     name: "{{ item }}"\r
     state: present\r
   with_items:\r
@@ -40,6 +40,24 @@
     - gcc\r
     - python-pip\r
 \r
+- name: install Red Hat system packages\r
+  package:\r
+    name: "{{ item }}"\r
+    state: present\r
+  with_items:\r
+    - librados-devel\r
+    - librbd-devel\r
+  when: ansible_os_family == "RedHat"\r
+\r
+- name: install Ubuntu system packages\r
+  package:\r
+    name: "{{ item }}"\r
+    state: present\r
+  with_items:\r
+    - librados-dev\r
+    - librbd-dev\r
+  when: ansible_os_family == "Debian"\r
+\r
 - name: create opensds work directory if it doesn't exist\r
   file:\r
     path: "{{ item }}"\r
@@ -92,8 +110,3 @@
   args:\r
     chdir: "{{ opensds_config_dir }}"\r
   ignore_errors: yes\r
-\r
-- name: include nbp-installer role if nbp_plugin_type != hotpot_only\r
-  include_role:\r
-    name: nbp-installer\r
-  when: nbp_plugin_type != "hotpot_only"\r