1 files changed, 51 insertions, 23 deletions
diff --git a/ci/ansible/roles/osdsdock/scenarios/ceph.yml b/ci/ansible/roles/osdsdock/scenarios/ceph.yml
index b844a29..f5ea8ef 100644
--- a/ci/ansible/roles/osdsdock/scenarios/ceph.yml
+++ b/ci/ansible/roles/osdsdock/scenarios/ceph.yml
@@ -1,3 +1,17 @@
+# Copyright (c) 2018 Huawei Technologies Co., Ltd. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 ---
 - name: install ceph-common external package when ceph backend enabled
   apt:
@@ -5,9 +19,21 @@
     state: present
   with_items:
     - ceph-common
-  when: enabled_backend == "ceph"
 
-- name: copy opensds ceph backend file if specify ceph backend
+- name: configure ceph section in opensds global info if specify ceph backend
+  shell: |
+    cat >> opensds.conf <<OPENSDS_GLOABL_CONFIG_DOC
+
+    [ceph]
+    name = {{ ceph_name }}
+    description = {{ ceph_description }}
+    driver_name = {{ ceph_driver_name }}
+    config_path = {{ ceph_config_path }}
+  args:
+    chdir: "{{ opensds_config_dir }}"
+  ignore_errors: yes
+
+- name: copy opensds ceph backend file to ceph config file if specify ceph backend
   copy:
     src: ../../../group_vars/ceph/ceph.yaml
     dest: "{{ ceph_config_path }}"
@@ -22,6 +48,7 @@
   git:
     repo: https://github.com/ceph/ceph-ansible.git
     dest: /opt/ceph-ansible
+    version: stable-3.0
   when:
     - cephansibleexisted.stat.exists is undefined or cephansibleexisted.stat.exists == false
 
@@ -35,43 +62,44 @@
     src: ../../../group_vars/ceph/all.yml
     dest: /opt/ceph-ansible/group_vars/all.yml
 
-- name: copy ceph osds.yml file into ceph-ansible group_vars directory
-  copy:
-    src: ../../../group_vars/ceph/osds.yml
-    dest: /opt/ceph-ansible/group_vars/osds.yml
-
 - name: copy site.yml.sample to site.yml in ceph-ansible
   copy:
     src: /opt/ceph-ansible/site.yml.sample
     dest: /opt/ceph-ansible/site.yml
 
-- name: ping all hosts
-  shell: ansible all -m ping -i ceph.hosts
-  become: true
-  args:
-    chdir: /opt/ceph-ansible
-
-- name: run ceph-ansible playbook
-  shell: ansible-playbook site.yml -i ceph.hosts | tee /var/log/ceph_ansible.log
+- name: ping all hosts and run ceph-ansible playbook
+  shell: "{{ item }}"
   become: true
+  with_items:
+    - ansible all -m ping -i ceph.hosts
+    - ansible-playbook site.yml -i ceph.hosts | tee /var/log/ceph_ansible.log
   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
+- name: check if ceph mon is running
   shell: ps aux | grep ceph-mon | grep -v grep
   ignore_errors: false
   changed_when: false
   register: service_ceph_mon_status
 
-- name: Create specified pools and initialize them with default pool size.
+- name: configure profile and disable some features in ceph for kernel compatible.
+  shell: "{{ item }}"
+  become: true
+  ignore_errors: yes
+  with_items:
+    - ceph osd crush tunables hammer
+    - grep -q "^rbd default features" /etc/ceph/ceph.conf || sed -i '/\[global\]/arbd default features = 1' /etc/ceph/ceph.conf
+  when: service_ceph_mon_status.rc == 0 and service_ceph_osd_status.rc == 0
+
+- name: create specified pools and initialize them with default pool size.
   shell: ceph osd pool create {{ item }} 100 && ceph osd pool set {{ item }} size 1
   ignore_errors: yes
   changed_when: false
   with_items: "{{ ceph_pools }}"
-  when: service_ceph_mon_status.rc == 0 # and service_ceph_osd_status.rc == 0
+  when: service_ceph_mon_status.rc == 0 and service_ceph_osd_status.rc == 0