Merge "Fix Yamllint Violations"

diff --git a/INFO b/INFO
index 74c1bec..91d9964 100644 (file)
--- a/INFO
+++ b/INFO
@@ -10,23 +10,21 @@ Repository: octopus
 Committers:
 dradez@redhat.com
 jiang.zhifeng@zte.com.cn
-cm-r@hpe.com
 ulrich.kleber@huawei.com
 fatih.degirmenci@ericsson.com
-Iben.Rodriguez@gmail.com
 
 Link to TSC approval of the project: http://meetbot.opnfv.org/meetings/opnfv-meeting/
 Link(s) to approval of additional submitters:
 
-ulrich.kleber@huawei.com: 
+ulrich.kleber@huawei.com:
 https://wiki.opnfv.org/wiki/tsc#tsc_meeting_february_10_2015 + email vote
 
 fatih.degirmenci@ericsson.com, Iben.Rodriguez@spirent.com, zhaoxinyu@huawei.com:
-http://ircbot.wl.linuxfoundation.org/meetings/opnfv-meeting/2015/opnfv-meeting.2015-03-30-14.00.html 
+http://ircbot.wl.linuxfoundation.org/meetings/opnfv-meeting/2015/opnfv-meeting.2015-03-30-14.00.html
 
 Huqiqi, Zhangyu and Weshayutin stepped down as committers
 
-pals@cisco.com removed from committer list by TSC decisions, see 
+pals@cisco.com removed from committer list by TSC decisions, see
 https://wiki.opnfv.org/wiki/tsc#october_20_2015
 Email address for sudhak@hpe.com updated
 

diff --git a/docs/scenario-lifecycle/create-sdf.png b/docs/scenario-lifecycle/create-sdf.png
new file mode 100644 (file)
index 0000000..c8a44ba
Binary files /dev/null and b/docs/scenario-lifecycle/create-sdf.png differ

diff --git a/docs/scenario-lifecycle/index.rst b/docs/scenario-lifecycle/index.rst
index 36dd92a..c1a9a52 100644 (file)
--- a/docs/scenario-lifecycle/index.rst
+++ b/docs/scenario-lifecycle/index.rst
@@ -21,4 +21,4 @@ Contents:
    mano-scenarios.rst
    current-status.rst
    scenario-descriptor-files.rst
-
+   workflows.rst

diff --git a/docs/scenario-lifecycle/pdf-and-sdf.png b/docs/scenario-lifecycle/pdf-and-sdf.png
new file mode 100644 (file)
index 0000000..729c5a4
Binary files /dev/null and b/docs/scenario-lifecycle/pdf-and-sdf.png differ

diff --git a/docs/scenario-lifecycle/workflows.rst b/docs/scenario-lifecycle/workflows.rst
new file mode 100644 (file)
index 0000000..c07b0f7
--- /dev/null
+++ b/docs/scenario-lifecycle/workflows.rst
@@ -0,0 +1,70 @@
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+.. http://creativecommons.org/licenses/by/4.0
+.. (c) 2017 OPNFV Ulrich Kleber (Huawei)
+
+
+Workflows
+----------
+
+Summary
+^^^^^^^^
+
+The general principle can be summarized by the following diagram:
+
+.. figure:: pdf-and-sdf.png
+
+Workflows for Scenario Owners
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The scenario owner creates the descriptor file based on the template.
+
+.. figure:: create-sdf.png
+
+Create new scenario from scratch
++++++++++++++++++++++++++++++++++++++++++++++++++
+
+This workflow will be exceptional.
+Most scenarios can easier start as children of an existing scenario;
+thus the author (scenario owner) can derive the SDF from the parent.
+But scenarios introducing new technologies affecting the whole architecture,
+e.g.containers, or higher level scenarios (e.g.MANO and Multisite which
+reference existing scenarios) can start without a parent.
+
+The following steps need to be done:
+
+  #. (Project team) Define set of components that need to be deployed
+  #. (Project) Find installers that can deploy the components
+  #. (Project&installer&CI) Agree on new keywords in SDF (e.g. component, feature name)
+  #. (Project) Assign owner
+  #. (Owner) Edit SDF, submit to octopus repo
+  #. (Owner) register scenario to participate in release as appropriate
+  #. (Owner&CI-team) Adapt jenkins triggers, so new scenario can be scheduled in valid installer/POD/Options combination(s).
+  #. (Installer-team) test deployment of components
+  #. (Project-team) Define test cases; register in test db
+
+Create child scenario by adding feature to existing scenario
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+Add additional installer to a specific scenario
+++++++++++++++++++++++++++++++++++++++++++++++++
+
+Add additional hardware or availability option to a scenario
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+Merge child scenario back to parent
+++++++++++++++++++++++++++++++++++++
+
+Promote specific scenario to generic scenario
+++++++++++++++++++++++++++++++++++++++++++++++
+
+Introduce SDF for existing Danube/Euphrates scenarios
+++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+
+Workflows for Installers
+^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Workflows for CI Tools
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+