Merge "support deploying etcd on aarch64 platform"
authorHui Wang <wanghui71@huawei.com>
Fri, 25 May 2018 09:09:51 +0000 (09:09 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Fri, 25 May 2018 09:09:51 +0000 (09:09 +0000)
INFO
ci/ansible/roles/osdsdb/scenarios/etcd.yml
docs/release/release-notes/release-notes.rst
docs/release/scenarios/k8-nosdn-stor4nfv-ha/index.rst [new file with mode: 0644]
docs/release/scenarios/k8-nosdn-stor4nfv-ha/scenario.description.rst [new file with mode: 0644]
docs/release/userguide/feature.userguide.rst [new file with mode: 0644]
docs/release/userguide/index.rst [new file with mode: 0644]
src/ceph/.gitkeep [deleted file]
src/ceph/ceph.rc [new file with mode: 0644]
src/do_patch.sh [new file with mode: 0755]

diff --git a/INFO b/INFO
index c03d03f..23df58b 100644 (file)
--- a/INFO
+++ b/INFO
@@ -2,8 +2,8 @@ Project: Storage For NFV (Stor4NFV)
 Project Creation Date: September 12th 2017
 Lifecycle State: Incubation
 Lifecycle State: Proposal
-Primary Contact: Shane Wang, Intel
-Project Lead: Shane Wang, Intel
+Primary Contact: Qiaowei Ren, Intel
+Project Lead: Qiaowei Ren, Intel
 Jira Project Name: Storage For NFV
 Jira Project Prefix: [STOR4NFV]
 mailing list tag [Should match Jira Project Prefix]
index 9c3352b..62abfdb 100644 (file)
   register: service_etcd_status\r
 \r
 - name: run etcd daemon service\r
-  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 &\r
+  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 &\r
   become: true\r
   args:\r
     chdir: "{{ etcd_dir }}"\r
   when: service_etcd_status.rc != 0\r
 \r
 - name: check etcd cluster health\r
-  shell: ./etcdctl cluster-health\r
+  shell: ./etcdctl --endpoints http://{{ etcd_host }}:{{ etcd_port }} cluster-health\r
   become: true\r
   ignore_errors: true\r
   args:\r
index 013991e..4cc2f05 100644 (file)
@@ -17,7 +17,7 @@ Version history
 | **Date**           | **Ver.**           | **Author**         | **Comment**        |
 |                    |                    |                    |                    |
 +--------------------+--------------------+--------------------+--------------------+
-| 2018-03-xx         | Fraser 1.0         | Qiaowei Ren        |                    |
+| 2018-04-10         | Fraser             | Qiaowei Ren        |                    |
 |                    |                    |                    |                    |
 +--------------------+--------------------+--------------------+--------------------+
 
@@ -47,10 +47,10 @@ Release Data
 | **Release designation**              | Fraser                               |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
-| **Release date**                     | 2018-03-xx                           |
+| **Release date**                     | 2018-04-10                           |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
-| **Purpose of the delivery**          | OPNFV Fraser release 1.0             |
+| **Purpose of the delivery**          | OPNFV Fraser release                 |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
 
diff --git a/docs/release/scenarios/k8-nosdn-stor4nfv-ha/index.rst b/docs/release/scenarios/k8-nosdn-stor4nfv-ha/index.rst
new file mode 100644 (file)
index 0000000..363390a
--- /dev/null
@@ -0,0 +1,17 @@
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+.. http://creativecommons.org/licenses/by/4.0
+.. (c) <optionally add copywriters name>
+
+.. _k8-nosdn-stor4nfv-ha:
+
+*********************************************
+k8-nosdn-stor4nfv-ha overview and description
+*********************************************
+.. This document will be used to provide a description of the scenario for an end user.
+.. You should explain the purpose of the scenario, the types of capabilities provided and
+..  the unique components that make up the scenario including how they are used.
+
+.. toctree::
+   :maxdepth: 1
+
+   scenario.description
diff --git a/docs/release/scenarios/k8-nosdn-stor4nfv-ha/scenario.description.rst b/docs/release/scenarios/k8-nosdn-stor4nfv-ha/scenario.description.rst
new file mode 100644 (file)
index 0000000..4c478bd
--- /dev/null
@@ -0,0 +1,61 @@
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+.. http://creativecommons.org/licenses/by/4.0
+.. (c) <optionally add copywriters name>
+
+This document provides scenario level details for <RELEASE> of <COMPONENT>.
+
+.. contents::
+   :depth: 3
+   :local:
+
+============
+Introduction
+============
+.. In this section explain the purpose of the scenario and the types of capabilities provided
+
+The k8-nosdn-stor4nfv-ha is intended to be used to install the OPNFV Stor4NFV project in a standard
+OPNFV High Availability mode. The OPNFV Stor4NFV project integrates the OpenSDS and Ceph projects
+into the OPNFV environment.
+
+Scenario components and composition
+===================================
+.. In this section describe the unique components that make up the scenario,
+.. what each component provides and why it has been included in order
+.. to communicate to the user the capabilities available in this scenario.
+
+This scenario installs everything needed to use the Stor4NFV project in an OPNFV
+environment. Mainly two upstream projects, including OpenSDS and Ceph, will be installed
+and deployed.
+
+Ceph plays a role as the data plane and the backend driver of OpenSDS. 'dock' service of
+OpenSDS need to be deployed in Ceph monitor node. The users can use OpenSDS, control plane,
+to create, inquire, and delete storage resources.
+
+Scenario usage overview
+=======================
+.. Provide a brief overview on how to use the scenario and the features available to the
+.. user.  This should be an "introduction" to the userguide document, and explicitly link to it,
+.. where the specifics of the features are covered including examples and API's
+
+Once this scenario is installed, it will be possible for kubernetes to create volume through
+OpenSDS API to call Ceph, and in this case, Ceph will be used for storage backend together
+with OpenSDS.
+
+Limitations, Issues and Workarounds
+===================================
+.. Explain scenario limitations here, this should be at a design level rather than discussing
+.. faults or bugs.  If the system design only provide some expected functionality then provide
+.. some insight at this point.
+
+References
+==========
+
+For more information about Stor4NFV, please visit
+
+https://wiki.opnfv.org/display/PROJ/Stor4NFV
+
+https://wiki.opnfv.org/display/STOR
+
+For more information on the OPNFV Fraser release, please visit
+
+http://www.opnfv.org/fraser
diff --git a/docs/release/userguide/feature.userguide.rst b/docs/release/userguide/feature.userguide.rst
new file mode 100644 (file)
index 0000000..e427873
--- /dev/null
@@ -0,0 +1,30 @@
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+.. http://creativecommons.org/licenses/by/4.0
+.. SPDX-License-Identifier CC-BY-4.0
+.. (c) Authors of Clover
+
+
+================================================================
+Stor4NFV User Guide (Fraser Release)
+================================================================
+
+This document provides the Stor4NFV user guide for the OPNFV Fraser release.
+
+Description
+===========
+
+Stor4NFV provides a storage solution based on Ceph and OpenSDS, and focuses
+on the optimization for storage intensive use cases of NFV, like I/O performance
+improvements.
+
+As project Stor4NFV's first release, the Fraser release includes installation and simple
+validation of foundational upstream projects including OpenSDS and Ceph.
+
+What is in Fraser?
+==================
+
+ * Integrate OpenSDS with Ceph
+
+ * Build Compass installer of Stor4NFV
+
+ * Test case for Yardstick and Functest
diff --git a/docs/release/userguide/index.rst b/docs/release/userguide/index.rst
new file mode 100644 (file)
index 0000000..ca71b3d
--- /dev/null
@@ -0,0 +1,13 @@
+.. This work is licensed under a Creative Commons Attribution 4.0 International
+.. License.
+.. http://creativecommons.org/licenses/by/4.0
+.. (c) OPNFV, Authors of Clover
+
+=================================
+Stor4NFV User Guide
+=================================
+
+.. toctree::
+   :maxdepth: 1
+
+   userguide
diff --git a/src/ceph/.gitkeep b/src/ceph/.gitkeep
deleted file mode 100644 (file)
index 617c45f..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-# Ignore everything in this directory
-*
-# Except this file !.gitkeep
diff --git a/src/ceph/ceph.rc b/src/ceph/ceph.rc
new file mode 100644 (file)
index 0000000..6c5f95e
--- /dev/null
@@ -0,0 +1,13 @@
+PROJECT="ceph"
+SUMMARY="a scalable distributed storage system"
+BRANCH="mimic"
+REPO="https://github.com/ceph/ceph.git"
+OPTION=""
+
+# array including all local patches, e.g.
+#
+# SOURCES=(
+#          "0001-crypto-add-openssl-support-for-RGW-encryption.patch" \
+#          "0001-add-QAT-support.patch" \
+#         )
+SOURCES=()
diff --git a/src/do_patch.sh b/src/do_patch.sh
new file mode 100755 (executable)
index 0000000..899ec9b
--- /dev/null
@@ -0,0 +1,52 @@
+#!/bin/bash
+
+recipe=$1
+ceph_dir=$PWD/src/ceph
+
+if [ -n "$1" ]; then
+    echo "recipe file: $1"
+else
+    echo "must supply one recipe file"
+    exit
+fi
+
+if [ ! -f "$recipe" ]; then
+    echo "recipe file $recipe doesn't exist"
+    exit
+fi
+
+source $recipe
+
+echo $PROJECT
+echo $SUMMARY
+echo $BRANCH
+echo $REPO
+echo $OPTION
+
+do_patch() {
+    echo ""
+    echo "$PROJECT do_patch"
+    cd $ceph_dir
+    if [ -d "$PROJECT" ]; then
+        rm -rf $PROJECT
+    fi
+    git clone -b $BRANCH $REPO $PROJECT
+    cd $PROJECT
+    for patch in ${SOURCES[@]}
+    do
+        echo ""
+        echo $patch
+        if [ ! -f "$ceph_dir/$patch" ]; then
+            echo "$patch doesn't exit"
+        fi
+        check_results=`patch -p1 < $ceph_dir/$patch | grep FAILED`
+        echo "command (patch -p1 < $ceph_dir/$patch) results are:"
+        echo "$check_results"
+        if [[ $check_results =~ "FAILED" ]]; then
+            echo "$patch could not be applied successfully"
+            exit
+        fi
+    done
+}
+
+do_patch