aboutsummaryrefslogtreecommitdiffstats
path: root/docs/release/configguide/Auto-featureconfig.rst
diff options
context:
space:
mode:
authorGerard Damm <gerard.damm@wipro.com>2018-06-28 20:50:15 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-06-28 20:50:15 +0000
commit626c007f5e1efab3e4a13b2ac0d292d7f9ca3231 (patch)
tree3653ab1243d77ecd641f1ce7cbdd5b13a4162fa4 /docs/release/configguide/Auto-featureconfig.rst
parent83e6b017f96742c7940d5f4ac93c7602c9ace3a7 (diff)
parentcafa029fd9f12257fa44e03907d966d9b20e4642 (diff)
Merge "docs: Fix long lines" into stable/fraser
Diffstat (limited to 'docs/release/configguide/Auto-featureconfig.rst')
-rw-r--r--docs/release/configguide/Auto-featureconfig.rst9
1 files changed, 7 insertions, 2 deletions
diff --git a/docs/release/configguide/Auto-featureconfig.rst b/docs/release/configguide/Auto-featureconfig.rst
index af16a9b..fe51be3 100644
--- a/docs/release/configguide/Auto-featureconfig.rst
+++ b/docs/release/configguide/Auto-featureconfig.rst
@@ -55,14 +55,19 @@ server with the OpenStack instance.
.. image:: auto-installTarget-initial.jpg
-The OpenStack instance running VNFs may need to be configured as per ONAP expectations, for example creating instances of ONAP projects/tenants, users, security groups, networks (private, public), connected to the Internet by a Router, and making sure expected VM images and flavors are present. A script (using OpenStack SDK, or OpenStack CLI, or even OpenStack Heat templates) would populate the OpenStack instance, as illustrated below:
+The OpenStack instance running VNFs may need to be configured as per ONAP expectations, for example creating
+instances of ONAP projects/tenants, users, security groups, networks (private, public), connected to the
+Internet by a Router, and making sure expected VM images and flavors are present. A script (using OpenStack
+SDK, or OpenStack CLI, or even OpenStack Heat templates) would populate the OpenStack instance, as illustrated below:
.. image:: auto-OS-config4ONAP.png
Jenkins (or more precisely JJB: Jenkins Job Builder) will be used for Continuous Integration in OPNFV releases, to ensure that the latest master
-branch of Auto is always working. The first 3 tasks in the pipeline would be: install OpenStack instance via OPNFV installer (Fuel/MCP for example), configure the OpenStack instance for ONAP, install ONAP (using the OpenStack instance network IDs in the ONAP YAMP file).
+branch of Auto is always working. The first 3 tasks in the pipeline would be: install OpenStack instance via OPNFV
+installer (Fuel/MCP for example), configure the OpenStack instance for ONAP, install ONAP (using the OpenStack
+instance network IDs in the ONAP YAMP file).
Moreover, Auto will offer an API, which can be imported as a module, and can be accessed for example
by a web application. The following diagram shows the planned structure for the Auto Git repository,