Add csi plugin ansible and tutorial document

As discussed on Compass4NFV meeting this week, we need to add the
support for csi-plugin. So in this patch I extend nbp-ansible to
support integrating with k8s using csi. All the detailed information
can be found in documents.
Besides, since opensds community has updated something in opensds
ansible, we should update ours to keep up with the latest code.

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

2 files changed, 10 insertions, 10 deletions

diff --git a/ci/ansible/roles/osdsdock/scenarios/ceph.yml b/ci/ansible/roles/osdsdock/scenarios/ceph.yml
index 2f6348e..2fa66b2 100644
--- a/ci/ansible/roles/osdsdock/scenarios/ceph.yml
+++ b/ci/ansible/roles/osdsdock/scenarios/ceph.yml
@@ -6,48 +6,48 @@
 

 - name: check for ceph-ansible source code existed

   stat:

-    path: /tmp/ceph-ansible

+    path: /opt/ceph-ansible

   ignore_errors: yes

   register: cephansibleexisted

 

 - name: download ceph-ansible source code

   git:

     repo: https://github.com/ceph/ceph-ansible.git

-    dest: /tmp/ceph-ansible

+    dest: /opt/ceph-ansible

   when:

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

 

 - name: copy ceph inventory host into ceph-ansible directory

   copy:

     src: ../../../group_vars/ceph/ceph.hosts

-    dest: /tmp/ceph-ansible/ceph.hosts

+    dest: /opt/ceph-ansible/ceph.hosts

 

 - name: copy ceph all.yml file into ceph-ansible group_vars directory

   copy:

     src: ../../../group_vars/ceph/all.yml

-    dest: /tmp/ceph-ansible/group_vars/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: /tmp/ceph-ansible/group_vars/osds.yml

+    dest: /opt/ceph-ansible/group_vars/osds.yml

 

 - name: copy site.yml.sample to site.yml in ceph-ansible

   copy:

-    src: /tmp/ceph-ansible/site.yml.sample

-    dest: /tmp/ceph-ansible/site.yml

+    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: /tmp/ceph-ansible

+    chdir: /opt/ceph-ansible

 

 - name: run ceph-ansible playbook

   shell: ansible-playbook site.yml -i ceph.hosts

   become: true

   args:

-    chdir: /tmp/ceph-ansible

+    chdir: /opt/ceph-ansible

 

 - name: Check if ceph osd is running

   shell: ps aux | grep ceph-osd | grep -v grep

diff --git a/ci/ansible/roles/osdsdock/scenarios/cinder_standalone.yml b/ci/ansible/roles/osdsdock/scenarios/cinder_standalone.yml
index 4ad5cea..7939d75 100644
--- a/ci/ansible/roles/osdsdock/scenarios/cinder_standalone.yml
+++ b/ci/ansible/roles/osdsdock/scenarios/cinder_standalone.yml
@@ -114,7 +114,7 @@
     sed -i "s/TAG ?= debian-cinder:latest/TAG ?= {{ cinder_image_tag }}:latest/g" Makefile

 

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

-    sed -i "s/image: lvm-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/volume_group = cinder-volumes /volume_group = {{ cinder_volume_group }}/g" etc/cinder.conf

   become: true