Fix some bugs when testing opensds ansible

When we tested opensds ansible script with multi-nodes ceph
cluster, it didn't work because ansible can't detect the osd
process on its local node. So I suggest we removed ceph osd
service check for now to solve the problem.

Change-Id: I62514afc147952a230c27cce01ff39de3b7bb9f3
Signed-off-by: leonwang <wanghui71@huawei.com>

diff --git a/ci/ansible/README.md b/ci/ansible/README.md
index 1bda3b3..0e2a3d1 100755 (executable)
--- a/ci/ansible/README.md
+++ b/ci/ansible/README.md
@@ -44,9 +44,11 @@ cd opensds/contrib/ansible
 
 ### Configure opensds cluster variables:
 ##### System environment:
-Configure the ```workplace``` in `group_vars/common.yml`:
+Configure the `workplace` and `container_enabled` in `group_vars/common.yml`:
 ```yaml
 workplace: /home/your_username # Change this field according to your username. If login as root, configure this parameter to '/root'
+
+container_enabled: <false_or_true>
 ```
 
 ##### LVM

diff --git a/ci/ansible/roles/osdsdock/scenarios/ceph.yml b/ci/ansible/roles/osdsdock/scenarios/ceph.yml
index 77c8b49..2b6196c 100755 (executable)
--- a/ci/ansible/roles/osdsdock/scenarios/ceph.yml
+++ b/ci/ansible/roles/osdsdock/scenarios/ceph.yml
@@ -49,16 +49,16 @@
     chdir: /opt/ceph-ansible
 
 - name: run ceph-ansible playbook
-  shell: ansible-playbook site.yml -i ceph.hosts
+  shell: ansible-playbook site.yml -i ceph.hosts | tee /var/log/ceph_ansible.log
   become: true
   args:
     chdir: /opt/ceph-ansible
 
-- name: Check if ceph osd is running
-  shell: ps aux | grep ceph-osd | grep -v grep
-  ignore_errors: false
-  changed_when: false
-  register: service_ceph_osd_status
+#- name: Check if ceph osd is running
+#  shell: ps aux | grep ceph-osd | grep -v grep
+#  ignore_errors: false
+#  changed_when: false
+#  register: service_ceph_osd_status
 
 - name: Check if ceph mon is running
   shell: ps aux | grep ceph-mon | grep -v grep
@@ -71,4 +71,4 @@
   ignore_errors: yes
   changed_when: false
   register: ceph_init_pool
-  when: service_ceph_mon_status.rc == 0 and service_ceph_osd_status.rc == 0
\ No newline at end of file
+  when: service_ceph_mon_status.rc == 0 # and service_ceph_osd_status.rc == 0