Update stor4nfv install scripts according to opensds aruba release

Since OpenSDS has published its aruba release and also supports
OpenStack scenario, this patch is designed for updating stor4nfv
code to prepare for integrating Compass4NFV and Apex installer on
OpenStack scenario.
Besides the large code changes, some tutorial docs are also added
or updated for better installing this project.

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

27 files changed, 1094 insertions, 306 deletions

diff --git a/ci/ansible/roles/cleaner/scenarios/auth-keystone.yml b/ci/ansible/roles/cleaner/scenarios/auth-keystone.yml
new file mode 100644
index 0000000..bbac49b
--- /dev/null
+++ b/ci/ansible/roles/cleaner/scenarios/auth-keystone.yml
@@ -0,0 +1,30 @@
+# 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: uninstall keystone
+  shell: "{{ item }}"
+  with_items:
+    - bash ./script/keystone.sh uninstall
+  when: opensds_auth_strategy == "keystone" and uninstall_keystone == true
+  ignore_errors: yes
+  become: yes
+  
+- name: cleanup keystone
+  shell: "{{ item }}"
+  with_items:
+    - bash ./script/keystone.sh cleanup
+  when: opensds_auth_strategy == "keystone" and cleanup_keystone == true
+  ignore_errors: yes
+  become: yes
diff --git a/ci/ansible/roles/cleaner/scenarios/backend.yml b/ci/ansible/roles/cleaner/scenarios/backend.yml
new file mode 100644
index 0000000..f929164
--- /dev/null
+++ b/ci/ansible/roles/cleaner/scenarios/backend.yml
@@ -0,0 +1,154 @@
+# 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: clean the volume group of lvm
+  shell:
+    _raw_params: |
+
+      # _clean_lvm_volume_group removes all default LVM volumes
+      #
+      # Usage: _clean_lvm_volume_group $vg
+      function _clean_lvm_volume_group {
+          local vg=$1
+
+          # Clean out existing volumes
+          sudo lvremove -f $vg
+      }
+
+      # _remove_lvm_volume_group removes the volume group
+      #
+      # Usage: _remove_lvm_volume_group $vg
+      function _remove_lvm_volume_group {
+          local vg=$1
+
+          # Remove the volume group
+          sudo vgremove -f $vg
+      }
+
+      # _clean_lvm_backing_file() removes the backing file of the
+      # volume group
+      #
+      # Usage: _clean_lvm_backing_file() $backing_file
+      function _clean_lvm_backing_file {
+          local backing_file=$1
+
+          # If the backing physical device is a loop device, it was probably setup by DevStack
+          if [[ -n "$backing_file" ]] && [[ -e "$backing_file" ]]; then
+              local vg_dev
+              vg_dev=$(sudo losetup -j $backing_file | awk -F':' '/'.img'/ { print $1}')
+              if [[ -n "$vg_dev" ]]; then
+                  sudo losetup -d $vg_dev
+              fi
+              rm -f $backing_file
+          fi
+      }
+
+      # clean_lvm_volume_group() cleans up the volume group and removes the
+      # backing file
+      #
+      # Usage: clean_lvm_volume_group $vg
+      function clean_lvm_volume_group {
+          local vg=$1
+
+          _clean_lvm_volume_group $vg
+          _remove_lvm_volume_group $vg
+          # if there is no logical volume left, it's safe to attempt a cleanup
+          # of the backing file
+          if [[ -z "$(sudo lvs --noheadings -o lv_name $vg 2>/dev/null)" ]]; then
+              _clean_lvm_backing_file {{ opensds_work_dir }}/volumegroups/${vg}.img
+          fi
+      }
+
+      clean_lvm_volume_group {{opensds_volume_group}}
+
+  args:
+    executable: /bin/bash
+  become: true
+  when: enabled_backend == "lvm"
+  ignore_errors: yes
+
+- name: stop cinder-standalone service
+  shell: docker-compose down
+  become: true
+  args:
+    chdir: "{{ cinder_data_dir }}/cinder/contrib/block-box"
+  when: enabled_backend == "cinder"
+  ignore_errors: yes
+
+- name: clean the volume group of cinder
+  shell:
+    _raw_params: |
+
+      # _clean_lvm_volume_group removes all default LVM volumes
+      #
+      # Usage: _clean_lvm_volume_group $vg
+      function _clean_lvm_volume_group {
+          local vg=$1
+
+          # Clean out existing volumes
+          sudo lvremove -f $vg
+      }
+
+      # _remove_lvm_volume_group removes the volume group
+      #
+      # Usage: _remove_lvm_volume_group $vg
+      function _remove_lvm_volume_group {
+          local vg=$1
+
+          # Remove the volume group
+          sudo vgremove -f $vg
+      }
+
+      # _clean_lvm_backing_file() removes the backing file of the
+      # volume group
+      #
+      # Usage: _clean_lvm_backing_file() $backing_file
+      function _clean_lvm_backing_file {
+          local backing_file=$1
+
+          # If the backing physical device is a loop device, it was probably setup by DevStack
+          if [[ -n "$backing_file" ]] && [[ -e "$backing_file" ]]; then
+              local vg_dev
+              vg_dev=$(sudo losetup -j $backing_file | awk -F':' '/'.img'/ { print $1}')
+              if [[ -n "$vg_dev" ]]; then
+                  sudo losetup -d $vg_dev
+              fi
+              rm -f $backing_file
+          fi
+      }
+
+      # clean_lvm_volume_group() cleans up the volume group and removes the
+      # backing file
+      #
+      # Usage: clean_lvm_volume_group $vg
+      function clean_lvm_volume_group {
+          local vg=$1
+
+          _clean_lvm_volume_group $vg
+          _remove_lvm_volume_group $vg
+          # if there is no logical volume left, it's safe to attempt a cleanup
+          # of the backing file
+          if [[ -z "$(sudo lvs --noheadings -o lv_name $vg 2>/dev/null)" ]]; then
+              _clean_lvm_backing_file {{ cinder_data_dir }}/${vg}.img
+          fi
+      }
+
+      clean_lvm_volume_group {{cinder_volume_group}}
+
+  args:
+    executable: /bin/bash
+  become: true
+  when: enabled_backend == "cinder"
+  ignore_errors: yes
diff --git a/ci/ansible/roles/cleaner/scenarios/release.yml b/ci/ansible/roles/cleaner/scenarios/release.yml
new file mode 100644
index 0000000..e365170
--- /dev/null
+++ b/ci/ansible/roles/cleaner/scenarios/release.yml
@@ -0,0 +1,24 @@
+# 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: clean up all release files if installed from release
+  file:
+    path: "{{ item }}"
+    state: absent
+    force: yes
+  with_items:
+    - "{{ opensds_tarball_dir }}"
+    - "{{ nbp_tarball_dir }}"
+  ignore_errors: yes
diff --git a/ci/ansible/roles/cleaner/scenarios/repository.yml b/ci/ansible/roles/cleaner/scenarios/repository.yml
new file mode 100644
index 0000000..a50689c
--- /dev/null
+++ b/ci/ansible/roles/cleaner/scenarios/repository.yml
@@ -0,0 +1,44 @@
+# 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.
+
+---
+- set_fact:
+    go_path: "{{ lookup('env', 'GOPATH') }}"
+
+- name: check go_path
+  shell: "{{ item }}"
+  with_items:
+      - echo "The environment variable GOPATH must be set and cannot be an empty string!"
+      - /bin/false
+  when: go_path == ""
+
+- name: clean opensds controller data
+  shell: make clean
+  args:
+    chdir: "{{ go_path }}/src/github.com/opensds/opensds"
+  when: install_from == "repository"
+
+- name: clean opensds northbound plugin data
+  shell: make clean
+  args:
+    chdir: "{{ go_path }}/src/github.com/opensds/nbp"
+  when: install_from == "repository" and nbp_plugin_type != "hotpot_only"
+
+- name: clean opensds dashboard data
+  shell: make clean
+  args:
+    chdir: "{{ go_path }}/src/github.com/opensds/opensds/dashboard"
+  when: dashboard_installation_type == "source_code"
+  become: yes
+  ignore_errors: yes
diff --git a/ci/ansible/roles/cleaner/tasks/main.yml b/ci/ansible/roles/cleaner/tasks/main.yml
index fcfb79b..8399b08 100644
--- a/ci/ansible/roles/cleaner/tasks/main.yml
+++ b/ci/ansible/roles/cleaner/tasks/main.yml
@@ -1,68 +1,44 @@
----

+# 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: kill osdslet daemon service

-  shell: killall osdslet

-  ignore_errors: yes

+  shell: killall osdslet osdsdock

   when: container_enabled == false

+  ignore_errors: true

 

 - name: kill osdslet containerized service

-  docker:

-    image: opensdsio/opensds-controller:latest

+  docker_container:

+    name: osdslet

+    image: "{{ controller_docker_image }}"

     state: stopped

   when: container_enabled == true

 

-- name: kill osdsdock daemon service

-  shell: killall osdsdock

-  ignore_errors: yes

-  when: container_enabled == false

-

 - name: kill osdsdock containerized service

-  docker:

-    image: opensdsio/opensds-dock:latest

+  docker_container:

+    name: osdsdock

+    image: "{{ dock_docker_image }}"

     state: stopped

   when: container_enabled == true

 

-- name: kill etcd daemon service

-  shell: killall etcd

-  ignore_errors: yes

-  when: db_driver == "etcd" and container_enabled == false

-

-- name: kill etcd containerized service

-  docker:

-    image: "{{ etcd_docker_image }}"

+- name: stop container where dashboard is located

+  docker_container:

+    name: dashboard

+    image: "{{ dashboard_docker_image }}"

     state: stopped

-  when: db_driver == "etcd" and container_enabled == true

-

-- name: remove etcd service data

-  file:

-    path: "{{ etcd_dir }}"

-    state: absent

-    force: yes

-  ignore_errors: yes

-  when: db_driver == "etcd"

-

-- name: remove etcd tarball

-  file:

-    path: "/opt/{{ etcd_tarball }}"

-    state: absent

-    force: yes

-  ignore_errors: yes

-  when: db_driver == "etcd"

-

-- name: clean opensds release files

-  file:

-    path: "{{ opensds_dir }}"

-    state: absent

-    force: yes

-  ignore_errors: yes

+  when: dashboard_installation_type == "container"

 

-- name: clean opensds release tarball file

-  file:

-    path: "{{ opensds_tarball_url }}"

-    state: absent

-    force: yes

-  ignore_errors: yes

-

-- name: clean opensds flexvolume plugins binary file

+- name: clean opensds flexvolume plugins binary file if flexvolume specified

   file:

     path: "{{ flexvolume_plugin_dir }}"

     state: absent

@@ -70,119 +46,38 @@
   ignore_errors: yes

   when: nbp_plugin_type == "flexvolume"

 

-- name: clean nbp release files

-  file:

-    path: "{{ nbp_dir }}"

-    state: absent

-    force: yes

-  ignore_errors: yes

-

-- name: clean nbp release tarball file

-  file:

-    path: "{{ nbp_tarball_url }}"

-    state: absent

-    force: yes

-  ignore_errors: yes

-

-- name: clean all opensds configuration files

-  file:

-    path: "{{ opensds_config_dir }}"

-    state: absent

-    force: yes

+- name: clean opensds csi plugin if csi plugin specified

+  shell: |

+    . /etc/profile

+    kubectl delete -f deploy/kubernetes

+  args:

+    chdir: "{{ nbp_work_dir }}/csi"

   ignore_errors: yes

+  when: nbp_plugin_type == "csi"

 

-- name: clean all opensds log files

+- name: clean all configuration and log files in opensds and nbp work directory

   file:

-    path: "{{ opensds_log_dir }}"

+    path: "{{ item }}"

     state: absent

     force: yes

+  with_items:

+    - "{{ opensds_work_dir }}"

+    - "{{ nbp_work_dir }}"

+    - "{{ opensds_config_dir }}"

+    - "{{ opensds_log_dir }}"

   ignore_errors: yes

 

-- name: check if it existed before cleaning a volume group

-  shell: vgdisplay {{ vg_name }}

-  ignore_errors: yes

-  register: vg_existed

-  when: enabled_backend == "lvm"

-

-- name: remove a volume group if lvm backend specified

-  lvg:

-    vg: "{{ vg_name }}"

-    state: absent

-  when: enabled_backend == "lvm" and vg_existed.rc == 0

-

-- name: remove physical volumes if lvm backend specified

-  shell: pvremove {{ item }}

-  with_items: "{{ pv_devices }}"

-  when: enabled_backend == "lvm"

-

-- name: stop cinder-standalone service

-  shell: docker-compose down

-  become: true

-  args:

-    chdir: "{{ cinder_data_dir }}/cinder/contrib/block-box"

-  when: enabled_backend == "cinder"

-

-- name: clean the volume group of cinder

-  shell:

-    _raw_params: |

-

-      # _clean_lvm_volume_group removes all default LVM volumes

-      #

-      # Usage: _clean_lvm_volume_group $vg

-      function _clean_lvm_volume_group {

-          local vg=$1

+- name: include scenarios/auth-keystone.yml when specifies keystone

+  include_tasks: scenarios/auth-keystone.yml

+  when: opensds_auth_strategy == "keystone"

 

-          # Clean out existing volumes

-          sudo lvremove -f $vg

-      }

+- name: include scenarios/repository.yml if installed from repository

+  include_tasks: scenarios/repository.yml

+  when: install_from == "repository" or dashboard_installation_type == "source_code"

 

-      # _remove_lvm_volume_group removes the volume group

-      #

-      # Usage: _remove_lvm_volume_group $vg

-      function _remove_lvm_volume_group {

-          local vg=$1

+- name: include scenarios/release.yml if installed from release

+  include_tasks: scenarios/release.yml

+  when: install_from == "release"

 

-          # Remove the volume group

-          sudo vgremove -f $vg

-      }

-

-      # _clean_lvm_backing_file() removes the backing file of the

-      # volume group

-      #

-      # Usage: _clean_lvm_backing_file() $backing_file

-      function _clean_lvm_backing_file {

-          local backing_file=$1

-

-          # If the backing physical device is a loop device, it was probably setup by DevStack

-          if [[ -n "$backing_file" ]] && [[ -e "$backing_file" ]]; then

-              local vg_dev

-              vg_dev=$(sudo losetup -j $backing_file | awk -F':' '/'.img'/ { print $1}')

-              if [[ -n "$vg_dev" ]]; then

-                  sudo losetup -d $vg_dev

-              fi

-              rm -f $backing_file

-          fi

-      }

-

-      # clean_lvm_volume_group() cleans up the volume group and removes the

-      # backing file

-      #

-      # Usage: clean_lvm_volume_group $vg

-      function clean_lvm_volume_group {

-          local vg=$1

-

-          _clean_lvm_volume_group $vg

-          _remove_lvm_volume_group $vg

-          # if there is no logical volume left, it's safe to attempt a cleanup

-          # of the backing file

-          if [[ -z "$(sudo lvs --noheadings -o lv_name $vg 2>/dev/null)" ]]; then

-              _clean_lvm_backing_file {{ cinder_data_dir }}/${vg}.img

-          fi

-      }

-

-      clean_lvm_volume_group {{cinder_volume_group}}

-

-  args:

-    executable: /bin/bash

-  become: true

-  when: enabled_backend == "cinder"

+- name: include scenarios/backend.yml for cleaning up storage backend service

+  include_tasks: scenarios/backend.yml

diff --git a/ci/ansible/roles/common/scenarios/container.yml b/ci/ansible/roles/common/scenarios/container.yml
new file mode 100644
index 0000000..0edbcef
--- /dev/null
+++ b/ci/ansible/roles/common/scenarios/container.yml
@@ -0,0 +1,18 @@
+# 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 docker-py package with pip when enabling containerized deployment
+  pip:
+    name: docker-py
diff --git a/ci/ansible/roles/common/scenarios/release.yml b/ci/ansible/roles/common/scenarios/release.yml
new file mode 100644
index 0000000..500d82e
--- /dev/null
+++ b/ci/ansible/roles/common/scenarios/release.yml
@@ -0,0 +1,38 @@
+# 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: check for opensds release files existed
+  stat:
+    path: "{{ opensds_tarball_dir }}"
+  ignore_errors: yes
+  register: opensdsreleasesexisted
+
+- name: download and extract the opensds release tarball if not exists
+  unarchive:
+    src={{ opensds_download_url }}
+    dest=/tmp/
+  when:
+    - opensdsreleasesexisted.stat.exists is undefined or opensdsreleasesexisted.stat.exists == false
+
+- name: change the mode of all binary files in opensds release
+  file:
+    path: "{{ opensds_tarball_dir }}/bin"
+    mode: 0755
+    recurse: yes
+
+- name: copy opensds tarball into opensds work directory
+  copy:
+    src: "{{ opensds_tarball_dir }}/"
+    dest: "{{ opensds_work_dir }}"
diff --git a/ci/ansible/roles/common/scenarios/repository.yml b/ci/ansible/roles/common/scenarios/repository.yml
new file mode 100644
index 0000000..3cddd34
--- /dev/null
+++ b/ci/ansible/roles/common/scenarios/repository.yml
@@ -0,0 +1,57 @@
+# 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.
+
+---
+- set_fact:
+    go_path: "{{ lookup('env', 'GOPATH') }}"
+  
+- name: check go_path
+  shell: "{{ item }}"
+  with_items:
+      - echo "The environment variable GOPATH must be set and cannot be an empty string!"
+      - /bin/false
+  when: go_path == ""
+
+- name: check for opensds source code existed
+  stat:
+    path: "{{ go_path }}/src/github.com/opensds/opensds"
+  ignore_errors: yes
+  register: opensdsexisted
+
+- name: download opensds source code if not exists
+  git:
+    repo: "{{ opensds_remote_url }}"
+    dest: "{{ go_path }}/src/github.com/opensds/opensds"
+    version: "{{ opensds_repo_branch }}"
+  when:
+    - opensdsexisted.stat.exists is undefined or opensdsexisted.stat.exists == false
+
+- name: build opensds binary file
+  shell: make
+  environment:
+    GOPATH: "{{ go_path }}"
+  args:
+    chdir: "{{ go_path }}/src/github.com/opensds/opensds"
+
+- name: copy opensds binary files into opensds work directory
+  copy:
+    src: "{{ go_path }}/src/github.com/opensds/opensds/build/out/"
+    dest: "{{ opensds_work_dir }}"
+
+- name: change the permissions of opensds executable files
+  file:
+    path: "{{ opensds_work_dir }}/bin"
+    state: directory
+    mode: 0755
+    recurse: yes
diff --git a/ci/ansible/roles/common/tasks/main.yml b/ci/ansible/roles/common/tasks/main.yml
index 7ae2234..daee059 100644
--- a/ci/ansible/roles/common/tasks/main.yml
+++ b/ci/ansible/roles/common/tasks/main.yml
@@ -1,84 +1,72 @@
+# 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: set script dir permissions

+  file:

+    path: ./script

+    mode: 0755

+    recurse: yes

+  ignore_errors: yes

+  become: yes

+    

+- name: check ansible version

+  shell: "{{ item }}"

+  with_items:

+    - bash ./script/check_ansible_version.sh

+  become: yes

+

 - name: run the equivalent of "apt-get update" as a separate step

   apt:

     update_cache: yes

 

-- name: install librados-dev and librbd-dev external packages

+- name: install make, gcc and pip external packages

   apt:

     name: "{{ item }}"

     state: present

   with_items:

-    - librados-dev

-    - librbd-dev

+    - make

+    - gcc

+    - python-pip

 

-- name: install docker-py package with pip when enabling containerized deployment

-  pip:

-    name: docker-py

-  when: container_enabled == true

-

-- name: check for opensds release files existed

-  stat:

-    path: "{{ opensds_dir }}"

-  ignore_errors: yes

-  register: opensdsreleasesexisted

-

-- name: download opensds release files

-  get_url:

-    url={{ opensds_download_url }}

-    dest={{ opensds_tarball_url }}

-  when:

-    - opensdsreleasesexisted.stat.exists is undefined or opensdsreleasesexisted.stat.exists == false

-

-- name: extract the opensds release tarball

-  unarchive:

-    src={{ opensds_tarball_url }}

-    dest=/opt/

-  when:

-    - opensdsreleasesexisted.stat.exists is undefined or opensdsreleasesexisted.stat.exists == false

-

-- name: check for nbp release files existed

-  stat:

-    path: "{{ nbp_dir }}"

-  ignore_errors: yes

-  register: nbpreleasesexisted

-

-- name: download nbp release files

-  get_url:

-    url={{ nbp_download_url }}

-    dest={{ nbp_tarball_url }}

-  when:

-    - nbpreleasesexisted.stat.exists is undefined or nbpreleasesexisted.stat.exists == false

-

-- name: extract the nbp release tarball

-  unarchive:

-    src={{ nbp_tarball_url }}

-    dest=/opt/

-  when:

-    - nbpreleasesexisted.stat.exists is undefined or nbpreleasesexisted.stat.exists == false

-

-- name: change the mode of all binary files in opensds release

+- name: create opensds work directory if it doesn't exist

   file:

-    path: "{{ opensds_dir }}/bin"

+    path: "{{ item }}"

+    state: directory

     mode: 0755

-    recurse: yes

+  with_items:

+    - "{{ opensds_work_dir }}"

+    - "{{ opensds_config_dir }}"

+    - "{{ opensds_driver_config_dir }}"

+    - "{{ opensds_log_dir }}"

 

-- name: change the mode of all binary files in nbp release

-  file:

-    path: "{{ nbp_dir }}/flexvolume"

-    mode: 0755

-    recurse: yes

+- name: include scenarios/repository.yml when installing from repository

+  include: scenarios/repository.yml

+  when: install_from == "repository"

 

-- name: create opensds global config directory if it doesn't exist

-  file:

-    path: "{{ opensds_config_dir }}/driver"

-    state: directory

-    mode: 0755

+- name: include scenarios/release.yml when installing from release

+  include: scenarios/release.yml

+  when: install_from == "release"

 

-- name: create opensds log directory if it doesn't exist

-  file:

-    path: "{{ opensds_log_dir }}"

-    state: directory

-    mode: 0755

+- name: include scenarios/container.yml when installing from container

+  include: scenarios/container.yml

+  when: install_from == "container"

+

+- name: copy config templates into opensds global config folder

+  copy:

+    src: ../../../../conf/

+    dest: "{{ opensds_config_dir }}"

 

 - name: configure opensds global info

   shell: |

@@ -88,34 +76,24 @@
     graceful = True

     log_file = {{ controller_log_file }}

     socket_order = inc

+    auth_strategy = {{ opensds_auth_strategy }}

 

     [osdsdock]

     api_endpoint = {{ dock_endpoint }}

     log_file = {{ dock_log_file }}

+    # Choose the type of dock resource, only support 'provisioner' and 'attacher'.

+    dock_type = {{ dock_type }}

     # Specify which backends should be enabled, sample,ceph,cinder,lvm and so on.

     enabled_backends = {{ enabled_backend }}

 

-    [lvm]

-    name = {{ lvm_name }}

-    description = {{ lvm_description }}

-    driver_name = {{ lvm_driver_name }}

-    config_path = {{ lvm_config_path }}

-

-    [ceph]

-    name = {{ ceph_name }}

-    description = {{ ceph_description }}

-    driver_name = {{ ceph_driver_name }}

-    config_path = {{ ceph_config_path }}

-

-    [cinder]

-    name = {{ cinder_name }}

-    description = {{ cinder_description }}

-    driver_name = {{ cinder_driver_name }}

-    config_path = {{ cinder_config_path }}

-

     [database]

     endpoint = {{ db_endpoint }}

     driver = {{ db_driver }}

   args:

     chdir: "{{ opensds_config_dir }}"

   ignore_errors: yes

+

+- name: include nbp-installer role if nbp_plugin_type != hotpot_only

+  include_role:

+    name: nbp-installer

+  when: nbp_plugin_type != "hotpot_only"

diff --git a/ci/ansible/roles/dashboard-installer/scenarios/container.yml b/ci/ansible/roles/dashboard-installer/scenarios/container.yml
new file mode 100644
index 0000000..e25d90f
--- /dev/null
+++ b/ci/ansible/roles/dashboard-installer/scenarios/container.yml
@@ -0,0 +1,26 @@
+# 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 docker-py package with pip when enabling containerized deployment
+  pip:
+    name: docker-py
+
+- name: run dashboard containerized service
+  docker_container:
+    name: dashboard
+    image: opensdsio/dashboard:latest
+    state: started
+    network_mode: host
+    restart_policy: always
diff --git a/ci/ansible/roles/dashboard-installer/scenarios/source-code.yml b/ci/ansible/roles/dashboard-installer/scenarios/source-code.yml
new file mode 100644
index 0000000..bd2b1ff
--- /dev/null
+++ b/ci/ansible/roles/dashboard-installer/scenarios/source-code.yml
@@ -0,0 +1,58 @@
+# 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.
+
+---
+- set_fact:
+    go_path: "{{ lookup('env', 'GOPATH') }}"
+
+- name: check go_path
+  shell: "{{ item }}"
+  with_items:
+    - echo "The environment variable GOPATH must be set and cannot be an empty string!"
+    - /bin/false
+  when: go_path == ""
+  
+- name: check for opensds source code existed
+  stat:
+    path: "{{ go_path }}/src/github.com/opensds/opensds"
+  register: opensdsexisted
+  
+- name: download opensds source code if not exists
+  git:
+    repo: "{{ opensds_remote_url }}"
+    dest: "{{ go_path }}/src/github.com/opensds/opensds"
+    version: "{{ opensds_repo_branch }}"
+  when:
+    - opensdsexisted.stat.exists is undefined or opensdsexisted.stat.exists == false
+
+- name: build and configure opensds dashboard
+  shell: "{{ item }}"
+  with_items:
+    - service apache2 stop
+    - make
+    - service apache2 start
+  args:
+    chdir: "{{ go_path }}/src/github.com/opensds/opensds/dashboard"
+    warn: false
+  become: yes
+
+- name: update nginx default config
+  become: yes
+  shell: bash ./script/set_nginx_config.sh
+
+- name: restart nginx
+  service:
+    name: nginx
+    state: restarted
+  
\ No newline at end of file
diff --git a/ci/ansible/roles/dashboard-installer/tasks/main.yml b/ci/ansible/roles/dashboard-installer/tasks/main.yml
new file mode 100644
index 0000000..ff221aa
--- /dev/null
+++ b/ci/ansible/roles/dashboard-installer/tasks/main.yml
@@ -0,0 +1,22 @@
+# 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: use container to install dashboard
+  include_tasks: scenarios/container.yml
+  when: dashboard_installation_type == "container"
+
+- name: use source code to install dashboard
+  include_tasks: scenarios/source-code.yml
+  when: dashboard_installation_type == "source_code"
diff --git a/ci/ansible/roles/nbp-installer/scenarios/csi.yml b/ci/ansible/roles/nbp-installer/scenarios/csi.yml
index e69de29..93fff88 100644
--- a/ci/ansible/roles/nbp-installer/scenarios/csi.yml
+++ b/ci/ansible/roles/nbp-installer/scenarios/csi.yml
@@ -0,0 +1,44 @@
+# 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: Configure opensds endpoint IP in opensds csi plugin
+  lineinfile:
+    dest: "{{ nbp_work_dir }}/csi/deploy/kubernetes/csi-configmap-opensdsplugin.yaml"
+    regexp: '^  opensdsendpoint'
+    line: '  opensdsendpoint: {{ opensds_endpoint }}'
+    backup: yes
+    
+- name: Configure opensds auth strategy in opensds csi plugin
+  lineinfile:
+    dest: "{{ nbp_work_dir }}/csi/deploy/kubernetes/csi-configmap-opensdsplugin.yaml"
+    regexp: '^  opensdsauthstrategy'
+    line: '  opensdsauthstrategy: {{ opensds_auth_strategy }}'
+    backup: yes
+    
+- name: Configure keystone os auth url in opensds csi plugin
+  lineinfile:
+    dest: "{{ nbp_work_dir }}/csi/deploy/kubernetes/csi-configmap-opensdsplugin.yaml"
+    regexp: '^  osauthurl'
+    line: '  osauthurl: {{ keystone_os_auth_url }}'
+    backup: yes
+  when: opensds_auth_strategy == "keystone"
+
+- name: Prepare and deploy opensds csi plugin
+  shell: |
+    . /etc/profile
+    kubectl create -f deploy/kubernetes
+  args:
+    chdir: "{{ nbp_work_dir }}/csi"
+  ignore_errors: yes
diff --git a/ci/ansible/roles/nbp-installer/scenarios/flexvolume.yml b/ci/ansible/roles/nbp-installer/scenarios/flexvolume.yml
index 0bba93b..52ec16d 100644
--- a/ci/ansible/roles/nbp-installer/scenarios/flexvolume.yml
+++ b/ci/ansible/roles/nbp-installer/scenarios/flexvolume.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: Create flexvolume plugin directory if not existed

   file:

@@ -7,5 +21,5 @@
 

 - name: Copy opensds flexvolume plugin binary file into flexvolume plugin dir

   copy:

-    src: "{{ nbp_dir }}/flexvolume/opensds"

+    src: "{{ nbp_work_dir }}/flexvolume/opensds"

     dest: "{{ flexvolume_plugin_dir }}/opensds"

diff --git a/ci/ansible/roles/nbp-installer/scenarios/release.yml b/ci/ansible/roles/nbp-installer/scenarios/release.yml
new file mode 100644
index 0000000..89429d7
--- /dev/null
+++ b/ci/ansible/roles/nbp-installer/scenarios/release.yml
@@ -0,0 +1,38 @@
+# 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: check for nbp release files existed
+  stat:
+    path: "{{ nbp_tarball_dir }}"
+  ignore_errors: yes
+  register: nbpreleasesexisted
+
+- name: download and extract the nbp release tarball if not exists
+  unarchive:
+    src={{ nbp_download_url }}
+    dest=/tmp/
+  when:
+    - nbpreleasesexisted.stat.exists is undefined or nbpreleasesexisted.stat.exists == false
+
+- name: change the mode of all binary files in nbp release
+  file:
+    path: "{{ nbp_tarball_dir }}/flexvolume"
+    mode: 0755
+    recurse: yes
+
+- name: copy nbp tarball into nbp work directory
+  copy:
+    src: "{{ nbp_tarball_dir }}/"
+    dest: "{{ nbp_work_dir }}"
diff --git a/ci/ansible/roles/nbp-installer/scenarios/repository.yml b/ci/ansible/roles/nbp-installer/scenarios/repository.yml
new file mode 100644
index 0000000..fb8059b
--- /dev/null
+++ b/ci/ansible/roles/nbp-installer/scenarios/repository.yml
@@ -0,0 +1,79 @@
+# 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.
+
+---
+- set_fact:
+    go_path: "{{ lookup('env', 'GOPATH') }}"
+  
+- name: check go_path
+  shell: "{{ item }}"
+  with_items:
+      - echo "The environment variable GOPATH must be set and cannot be an empty string!"
+      - /bin/false
+  when: go_path == ""
+
+- name: check for nbp source code existed
+  stat:
+    path: "{{ go_path }}/src/github.com/opensds/nbp"
+  ignore_errors: yes
+  register: nbpexisted
+
+- name: download nbp source code if not exists
+  git:
+    repo: "{{ nbp_remote_url }}"
+    dest: "{{ go_path }}/src/github.com/opensds/nbp"
+    version: "{{ nbp_repo_branch }}"
+  when:
+    - nbpexisted.stat.exists is undefined or nbpexisted.stat.exists == false
+
+- name: build nbp binary file
+  shell: make
+  environment:
+    GOPATH: "{{ go_path }}"
+  args:
+    chdir: "{{ go_path }}/src/github.com/opensds/nbp"
+
+- name: create nbp install directory if it doesn't exist
+  file:
+    path: "{{ item }}"
+    state: directory
+    mode: 0755
+  with_items:
+    - "{{ nbp_work_dir }}/csi"
+    - "{{ nbp_work_dir }}/flexvolume"
+    - "{{ nbp_work_dir }}/provisioner"
+
+- name: copy nbp csi deploy scripts into nbp work directory
+  copy:
+    src: "{{ item }}"
+    dest: "{{ nbp_work_dir }}/csi/"
+    directory_mode: yes
+  with_items:
+    - "{{ go_path }}/src/github.com/opensds/nbp/csi/server/deploy"
+    - "{{ go_path }}/src/github.com/opensds/nbp/csi/server/examples"
+
+- name: copy nbp flexvolume binary file into nbp work directory
+  copy:
+    src: "{{ go_path }}/src/github.com/opensds/nbp/.output/flexvolume.server.opensds"
+    dest: "{{ nbp_work_dir }}/flexvolume/opensds"
+    mode: 0755
+
+- name: copy nbp provisioner deploy scripts into nbp work directory
+  copy:
+    src: "{{ item }}"
+    dest: "{{ nbp_work_dir }}/provisioner/"
+    directory_mode: yes
+  with_items:
+    - "{{ go_path }}/src/github.com/opensds/nbp/opensds-provisioner/deploy"
+    - "{{ go_path }}/src/github.com/opensds/nbp/opensds-provisioner/examples"
diff --git a/ci/ansible/roles/nbp-installer/tasks/main.yml b/ci/ansible/roles/nbp-installer/tasks/main.yml
index 58057f1..dd13195 100644
--- a/ci/ansible/roles/nbp-installer/tasks/main.yml
+++ b/ci/ansible/roles/nbp-installer/tasks/main.yml
@@ -1,8 +1,45 @@
+# 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: include scenarios/flexvolume.yml

+- name: install open-iscsi external packages

+  apt:

+    name: "{{ item }}"

+    state: present

+  with_items:

+    - open-iscsi

+

+- name: create nbp work directory if it doesn't exist

+  file:

+    path: "{{ item }}"

+    state: directory

+    mode: 0755

+  with_items:

+    - "{{ nbp_work_dir }}"

+

+- name: include scenarios/repository.yml when installing from repository

+  include: scenarios/repository.yml

+  when: install_from == "repository"

+

+- name: include scenarios/release.yml when installing from release

+  include: scenarios/release.yml

+  when: install_from == "release"

+

+- name: include scenarios/flexvolume.yml when nbp plugin type is flexvolume

   include: scenarios/flexvolume.yml

   when: nbp_plugin_type == "flexvolume"

 

-- name: include scenarios/csi.yml

+- name: include scenarios/csi.yml when nbp plugin type is csi

   include: scenarios/csi.yml

   when: nbp_plugin_type == "csi"

diff --git a/ci/ansible/roles/osdsauth/tasks/main.yml b/ci/ansible/roles/osdsauth/tasks/main.yml
new file mode 100644
index 0000000..2148bb0
--- /dev/null
+++ b/ci/ansible/roles/osdsauth/tasks/main.yml
@@ -0,0 +1,21 @@
+# 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 keystone
+  shell: "{{ item }}"
+  with_items:
+    - bash ./script/keystone.sh install
+  when: opensds_auth_strategy == "keystone"
+  become: yes
diff --git a/ci/ansible/roles/osdsdb/scenarios/container.yml b/ci/ansible/roles/osdsdb/scenarios/container.yml
index d32057d..0c7664c 100644
--- a/ci/ansible/roles/osdsdb/scenarios/container.yml
+++ b/ci/ansible/roles/osdsdb/scenarios/container.yml
@@ -1,10 +1,24 @@
+# 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: run etcd containerized service

-  docker:

+  docker_container:

     name: myetcd

     image: "{{ etcd_docker_image }}"

-    command: /usr/local/bin/etcd --advertise-client-urls http://{{ etcd_host }}:{{ etcd_port }} --listen-client-urls http://{{ etcd_host }}:{{ etcd_port }} -advertise-client-urls http://{{ etcd_host }}:{{ etcd_peer_port }} -listen-peer-urls http://{{ etcd_host }}:{{ etcd_peer_port }}

+    command: /usr/local/bin/etcd --advertise-client-urls http://{{ etcd_host }}:{{ etcd_port }} --listen-client-urls http://{{ etcd_host }}:{{ etcd_port }} --listen-peer-urls http://{{ etcd_host }}:{{ etcd_peer_port }}

     state: started

-    net: host

+    network_mode: host

     volumes:

     - "/usr/share/ca-certificates/:/etc/ssl/certs"

diff --git a/ci/ansible/roles/osdsdb/scenarios/etcd.yml b/ci/ansible/roles/osdsdb/scenarios/etcd.yml
index 62abfdb..acd4937 100644
--- a/ci/ansible/roles/osdsdb/scenarios/etcd.yml
+++ b/ci/ansible/roles/osdsdb/scenarios/etcd.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: check for etcd existed

   stat:

@@ -25,7 +39,7 @@
   register: service_etcd_status

 

 - name: run etcd daemon service

-  shell: nohup ./etcd --advertise-client-urls http://{{ etcd_host }}:{{ etcd_port }} --listen-client-urls http://{{ etcd_host }}:{{ etcd_port }} -listen-peer-urls http://{{ etcd_host }}:{{ etcd_peer_port }} &>>etcd.log &

+  shell: nohup ./etcd --advertise-client-urls http://{{ etcd_host }}:{{ etcd_port }} --listen-client-urls http://{{ etcd_host }}:{{ etcd_port }}  --listen-peer-urls http://{{ etcd_host }}:{{ etcd_peer_port }} &>>etcd.log &

   become: true

   args:

     chdir: "{{ etcd_dir }}"

diff --git a/ci/ansible/roles/osdsdb/tasks/main.yml b/ci/ansible/roles/osdsdb/tasks/main.yml
index 5b42eaf..a826d21 100644
--- a/ci/ansible/roles/osdsdb/tasks/main.yml
+++ b/ci/ansible/roles/osdsdb/tasks/main.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: include scenarios/etcd.yml

   include: "{{ item }}"

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

diff --git a/ci/ansible/roles/osdsdock/scenarios/cinder.yml b/ci/ansible/roles/osdsdock/scenarios/cinder.yml
index 6136f25..97ebe9d 100644
--- a/ci/ansible/roles/osdsdock/scenarios/cinder.yml
+++ b/ci/ansible/roles/osdsdock/scenarios/cinder.yml
@@ -1,5 +1,32 @@
+# 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: copy opensds cinder backend file if specify cinder backend

+- name: configure cinder section in opensds global info if specify cinder backend

+  shell: |

+    cat >> opensds.conf <<OPENSDS_GLOABL_CONFIG_DOC

+

+    [cinder]

+    name = {{ cinder_name }}

+    description = {{ cinder_description }}

+    driver_name = {{ cinder_driver_name }}

+    config_path = {{ cinder_config_path }}

+  args:

+    chdir: "{{ opensds_config_dir }}"

+  ignore_errors: yes

+

+- name: copy opensds cinder backend file to cinder config path if specify cinder backend

   copy:

     src: ../../../group_vars/cinder/cinder.yaml

     dest: "{{ cinder_config_path }}"

diff --git a/ci/ansible/roles/osdsdock/scenarios/cinder_standalone.yml b/ci/ansible/roles/osdsdock/scenarios/cinder_standalone.yml
index 49f4063..b62d2d1 100644
--- a/ci/ansible/roles/osdsdock/scenarios/cinder_standalone.yml
+++ b/ci/ansible/roles/osdsdock/scenarios/cinder_standalone.yml
@@ -1,21 +1,42 @@
----

-- name: install python-pip

-  apt:

-    name: python-pip

-

-- name: install lvm2

-  apt:

-    name: lvm2

+# 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 thin-provisioning-tools

+---

+- name: install python-pip, lvm2, thin-provisioning-tools and docker-compose

   apt:

-    name: thin-provisioning-tools

+    name: "{{ item }}"

+    state: present

+  with_items:

+    - python-pip

+    - lvm2

+    - thin-provisioning-tools

+    - docker-compose

+

+- name: configure cinder section in opensds global info if specify cinder backend

+  shell: |

+    cat >> opensds.conf <<OPENSDS_GLOABL_CONFIG_DOC

 

-- name: install docker-compose

-  pip:

-    name: docker-compose

+    [cinder]

+    name = {{ cinder_name }}

+    description = {{ cinder_description }}

+    driver_name = {{ cinder_driver_name }}

+    config_path = {{ cinder_config_path }}

+  args:

+    chdir: "{{ opensds_config_dir }}"

+  ignore_errors: yes

 

-- name: copy opensds cinder backend file if specify cinder backend

+- name: copy opensds cinder backend file to cinder config path if specify cinder backend

   copy:

     src: ../../../group_vars/cinder/cinder.yaml

     dest: "{{ cinder_config_path }}"

@@ -40,6 +61,11 @@
               local vg_dev

               vg_dev=`sudo losetup -f --show $backing_file`

 

+              # Only create physical volume if it doesn't already exist

+              if ! sudo pvs $vg_dev; then

+                  sudo pvcreate $vg_dev

+              fi

+

               # Only create volume group if it doesn't already exist

               if ! sudo vgs $vg; then

                   sudo vgcreate $vg $vg_dev

@@ -120,6 +146,8 @@
     sed -i "s/image: debian-cinder/image: {{ cinder_image_tag }}/g" docker-compose.yml

     sed -i "s/image: lvm-debian-cinder/image: lvm-{{ cinder_image_tag }}/g" docker-compose.yml

 

+    sed -i "s/3306:3306/3307:3306/g" docker-compose.yml

+

     sed -i "s/volume_group = cinder-volumes /volume_group = {{ cinder_volume_group }}/g" etc/cinder.conf

   become: true

   args:

@@ -141,5 +169,5 @@
   wait_for:

     host: 127.0.0.1

     port: 8776

-    delay: 2

+    delay: 15

     timeout: 120

diff --git a/ci/ansible/roles/osdsdock/scenarios/lvm.yml b/ci/ansible/roles/osdsdock/scenarios/lvm.yml
index 743fe3b..a93f1e4 100644
--- a/ci/ansible/roles/osdsdock/scenarios/lvm.yml
+++ b/ci/ansible/roles/osdsdock/scenarios/lvm.yml
@@ -1,20 +1,78 @@
+# 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 lvm2 external package when lvm backend enabled

+- name: install lvm2 ang tgt external package when lvm backend enabled

   apt:

-    name: lvm2

+    name: "{{ item }}"

+    state: present

+  with_items:

+    - lvm2

+    - tgt

+    - thin-provisioning-tools

+

+- name: configure lvm section in opensds global info if specify lvm backend

+  shell: |

+    cat >> opensds.conf <<OPENSDS_GLOABL_CONFIG_DOC

+

+    [lvm]

+    name = {{ lvm_name }}

+    description = {{ lvm_description }}

+    driver_name = {{ lvm_driver_name }}

+    config_path = {{ lvm_config_path }}

+  args:

+    chdir: "{{ opensds_config_dir }}"

+  ignore_errors: yes

 

-- name: copy opensds lvm backend file if specify lvm backend

+- name: copy opensds lvm backend file to lvm config path if specify lvm backend

   copy:

     src: ../../../group_vars/lvm/lvm.yaml

     dest: "{{ lvm_config_path }}"

 

-- name: check if volume group existed

-  shell: vgdisplay {{ vg_name }}

-  ignore_errors: yes

-  register: vg_existed

+- name: create directory to volume group file

+  file:

+    path: "{{ opensds_work_dir }}/volumegroups"

+    state: directory

+    recurse: yes

+

+- name: create volume group in thin mode

+  shell:

+    _raw_params: |

+      function _create_lvm_volume_group {

+          local vg=$1

+          local size=$2

+

+          local backing_file={{ opensds_work_dir }}/volumegroups/${vg}.img

+          if ! sudo vgs $vg; then

+              # Only create if the file doesn't already exists

+              [[ -f $backing_file ]] || truncate -s $size $backing_file

+              local vg_dev

+              vg_dev=`sudo losetup -f --show $backing_file`

+

+              # Only create physical volume if it doesn't already exist

+              if ! sudo pvs $vg_dev; then

+                  sudo pvcreate $vg_dev

+              fi

 

-- name: create a volume group and initialize it

-  lvg:

-    vg: "{{ vg_name }}"

-    pvs: "{{ pv_devices }}"

-  when: vg_existed is undefined or vg_existed.rc != 0

+              # Only create volume group if it doesn't already exist

+              if ! sudo vgs $vg; then

+                  sudo vgcreate $vg $vg_dev

+              fi

+          fi

+      }

+      modprobe dm_thin_pool

+      _create_lvm_volume_group {{ opensds_volume_group }} 10G

+  args:

+    executable: /bin/bash

+  become: true

diff --git a/ci/ansible/roles/osdsdock/tasks/main.yml b/ci/ansible/roles/osdsdock/tasks/main.yml
index 215cf00..8b18c8d 100644
--- a/ci/ansible/roles/osdsdock/tasks/main.yml
+++ b/ci/ansible/roles/osdsdock/tasks/main.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: include scenarios/lvm.yml

   include: scenarios/lvm.yml

@@ -28,15 +42,15 @@
         ps aux | grep osdsdock | grep -v grep && break

       done

   args:

-    chdir: "{{ opensds_dir }}"

+    chdir: "{{ opensds_work_dir }}"

   when: container_enabled == false

 

 - name: run osdsdock containerized service

-  docker:

+  docker_container:

     name: osdsdock

     image: opensdsio/opensds-dock:latest

     state: started

-    net: host

+    network_mode: host

     privileged: true

     volumes:

     - "/etc/opensds/:/etc/opensds"

diff --git a/ci/ansible/roles/osdslet/tasks/main.yml b/ci/ansible/roles/osdslet/tasks/main.yml
index 02b71fc..87ea816 100644
--- a/ci/ansible/roles/osdslet/tasks/main.yml
+++ b/ci/ansible/roles/osdslet/tasks/main.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: run osdslet daemon service

   shell:

@@ -12,15 +26,15 @@
         ps aux | grep osdslet | grep -v grep && break

       done

   args:

-    chdir: "{{ opensds_dir }}"

+    chdir: "{{ opensds_work_dir }}"

   when: container_enabled == false

 

 - name: run osdslet containerized service

-  docker:

+  docker_container:

     name: osdslet

     image: opensdsio/opensds-controller:latest

     state: started

-    net: host

+    network_mode: host

     volumes:

     - "/etc/opensds/:/etc/opensds"

   when: container_enabled == true