From 6bc7e08cc5d80941c80e8d36d3a2b1373f147a05 Mon Sep 17 00:00:00 2001
From: leonwang <wanghui71@huawei.com>
Date: Thu, 15 Mar 2018 08:25:05 +0000
Subject: 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>
---
 ci/nbp-ansible/roles/cleaner/tasks/main.yml        | 22 --------------------
 ci/nbp-ansible/roles/common/tasks/main.yml         | 24 ----------------------
 ci/nbp-ansible/roles/installer/scenarios/csi.yml   |  0
 .../roles/installer/scenarios/flexvolume.yml       | 11 ----------
 ci/nbp-ansible/roles/installer/tasks/main.yml      |  8 --------
 5 files changed, 65 deletions(-)
 delete mode 100644 ci/nbp-ansible/roles/cleaner/tasks/main.yml
 delete mode 100644 ci/nbp-ansible/roles/common/tasks/main.yml
 delete mode 100644 ci/nbp-ansible/roles/installer/scenarios/csi.yml
 delete mode 100644 ci/nbp-ansible/roles/installer/scenarios/flexvolume.yml
 delete mode 100644 ci/nbp-ansible/roles/installer/tasks/main.yml

(limited to 'ci/nbp-ansible/roles')

diff --git a/ci/nbp-ansible/roles/cleaner/tasks/main.yml b/ci/nbp-ansible/roles/cleaner/tasks/main.yml
deleted file mode 100644
index 9e81756..0000000
--- a/ci/nbp-ansible/roles/cleaner/tasks/main.yml
+++ /dev/null
@@ -1,22 +0,0 @@
----
-- name: clean opensds flexvolume plugins binary file
-  file:
-    path: "{{ flexvolume_plugin_dir }}"
-    state: absent
-    force: yes
-  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
diff --git a/ci/nbp-ansible/roles/common/tasks/main.yml b/ci/nbp-ansible/roles/common/tasks/main.yml
deleted file mode 100644
index b612e24..0000000
--- a/ci/nbp-ansible/roles/common/tasks/main.yml
+++ /dev/null
@@ -1,24 +0,0 @@
----
-- name: Run the equivalent of "apt-get update" as a separate step
-  apt:
-    update_cache: yes
-
-- name: check for nbp release files existed
-  stat:
-    path: "{{ nbp_dir }}"
-  ignore_errors: yes
-  register: releasesexisted
-
-- name: download nbp release files
-  get_url:
-    url={{ nbp_download_url }}
-    dest={{ nbp_tarball_url }}
-  when:
-    - releasesexisted.stat.exists is undefined or releasesexisted.stat.exists == false
-
-- name: extract the nbp release tarball
-  unarchive:
-    src={{ nbp_tarball_url }}
-    dest=/opt/
-  when:
-    - releasesexisted.stat.exists is undefined or releasesexisted.stat.exists == false
diff --git a/ci/nbp-ansible/roles/installer/scenarios/csi.yml b/ci/nbp-ansible/roles/installer/scenarios/csi.yml
deleted file mode 100644
index e69de29..0000000
diff --git a/ci/nbp-ansible/roles/installer/scenarios/flexvolume.yml b/ci/nbp-ansible/roles/installer/scenarios/flexvolume.yml
deleted file mode 100644
index 0bba93b..0000000
--- a/ci/nbp-ansible/roles/installer/scenarios/flexvolume.yml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-- name: Create flexvolume plugin directory if not existed
-  file:
-    path: "{{ flexvolume_plugin_dir }}"
-    state: directory
-    mode: 0755
-
-- name: Copy opensds flexvolume plugin binary file into flexvolume plugin dir
-  copy:
-    src: "{{ nbp_dir }}/flexvolume/opensds"
-    dest: "{{ flexvolume_plugin_dir }}/opensds"
diff --git a/ci/nbp-ansible/roles/installer/tasks/main.yml b/ci/nbp-ansible/roles/installer/tasks/main.yml
deleted file mode 100644
index 58057f1..0000000
--- a/ci/nbp-ansible/roles/installer/tasks/main.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- name: include scenarios/flexvolume.yml
-  include: scenarios/flexvolume.yml
-  when: nbp_plugin_type == "flexvolume"
-
-- name: include scenarios/csi.yml
-  include: scenarios/csi.yml
-  when: nbp_plugin_type == "csi"
-- 
cgit 1.2.3-korg