Merge nbp installation into opensds ansible script

In this update, the nbp-ansible is removed from stor4nfv repo and
all code has been merged into ansible repo. Besides, the latest
update reduce a lot of work to download and build opensds source
code. And some installation docs are also updated.

Remove license statement for the moment.

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

3 files changed, 57 insertions, 57 deletions

diff --git a/ci/ansible/roles/osdsdb/scenarios/container.yml b/ci/ansible/roles/osdsdb/scenarios/container.yml
index 8a75ef2..afbd15b 100644
--- a/ci/ansible/roles/osdsdb/scenarios/container.yml
+++ b/ci/ansible/roles/osdsdb/scenarios/container.yml
@@ -1,10 +1,10 @@
----
-- name: run etcd containerized service
-  docker:
-    name: myetcd
-    image: quay.io/coreos/etcd:latest
-    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 }}
-    state: started
-    net: host
-    volumes:
-    - "/usr/share/ca-certificates/:/etc/ssl/certs"
+---

+- name: run etcd containerized service

+  docker:

+    name: myetcd

+    image: quay.io/coreos/etcd:latest

+    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 }}

+    state: started

+    net: 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 b05f0e7..9c3352b 100755..100644
--- a/ci/ansible/roles/osdsdb/scenarios/etcd.yml
+++ b/ci/ansible/roles/osdsdb/scenarios/etcd.yml
@@ -1,39 +1,39 @@
----
-- name: check for etcd existed
-  stat:
-    path: "{{ etcd_dir }}/etcd"
-  ignore_errors: yes
-  register: etcdexisted
-
-- name: download etcd
-  get_url:
-    url={{ etcd_download_url }}
-    dest=/opt/{{ etcd_tarball }}
-  when:
-    - etcdexisted.stat.exists is undefined or etcdexisted.stat.exists == false
-
-- name: extract the etcd tarball
-  unarchive:
-    src=/opt/{{ etcd_tarball }}
-    dest=/opt/
-  when:
-    - etcdexisted.stat.exists is undefined or etcdexisted.stat.exists == false
-
-- name: Check if etcd is running
-  shell: ps aux | grep etcd | grep -v grep
-  ignore_errors: true
-  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 }} -advertise-client-urls http://{{ etcd_host }}:{{ etcd_peer_port }} -listen-peer-urls http://{{ etcd_host }}:{{ etcd_peer_port }} &>>etcd.log &
-  become: true
-  args:
-    chdir: "{{ etcd_dir }}"
-  when: service_etcd_status.rc != 0
-
-- name: check etcd cluster health
-  shell: ./etcdctl cluster-health
-  become: true
-  ignore_errors: true
-  args:
-    chdir: "{{ etcd_dir }}"
+---

+- name: check for etcd existed

+  stat:

+    path: "{{ etcd_dir }}/etcd"

+  ignore_errors: yes

+  register: etcdexisted

+

+- name: download etcd

+  get_url:

+    url={{ etcd_download_url }}

+    dest=/opt/{{ etcd_tarball }}

+  when:

+    - etcdexisted.stat.exists is undefined or etcdexisted.stat.exists == false

+

+- name: extract the etcd tarball

+  unarchive:

+    src=/opt/{{ etcd_tarball }}

+    dest=/opt/

+  when:

+    - etcdexisted.stat.exists is undefined or etcdexisted.stat.exists == false

+

+- name: Check if etcd is running

+  shell: ps aux | grep etcd | grep -v grep

+  ignore_errors: true

+  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 }} -advertise-client-urls http://{{ etcd_host }}:{{ etcd_peer_port }} -listen-peer-urls http://{{ etcd_host }}:{{ etcd_peer_port }} &>>etcd.log &

+  become: true

+  args:

+    chdir: "{{ etcd_dir }}"

+  when: service_etcd_status.rc != 0

+

+- name: check etcd cluster health

+  shell: ./etcdctl cluster-health

+  become: true

+  ignore_errors: true

+  args:

+    chdir: "{{ etcd_dir }}"

diff --git a/ci/ansible/roles/osdsdb/tasks/main.yml b/ci/ansible/roles/osdsdb/tasks/main.yml
index 03530b4..efbfba9 100755..100644
--- a/ci/ansible/roles/osdsdb/tasks/main.yml
+++ b/ci/ansible/roles/osdsdb/tasks/main.yml
@@ -1,8 +1,8 @@
----
-- name: include scenarios/etcd.yml
-  include: scenarios/etcd.yml
-  when: db_driver == "etcd" and container_enabled == false
-
-- name: include scenarios/container.yml
-  include: scenarios/container.yml
-  when: db_driver == "etcd" and container_enabled == true
+---

+- name: include scenarios/etcd.yml

+  include: scenarios/etcd.yml

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

+

+- name: include scenarios/container.yml

+  include: scenarios/container.yml

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