summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xdocs/configguide/featureconfig.rst (renamed from docs/configguide/installation.rst)1
-rw-r--r--docs/configguide/index.rst7
-rwxr-xr-xdocs/index.rst1
-rwxr-xr-xdocs/release/NEWS.rst1
-rw-r--r--docs/release/index.rst4
-rwxr-xr-xdocs/userguide/featureusage.rst (renamed from docs/userguide/quickstart.rst)8
-rw-r--r--docs/userguide/index.rst7
-rw-r--r--fuel-plugin-ovsnfv/ovs_package/ubuntu/dependencies.txt1
8 files changed, 16 insertions, 14 deletions
diff --git a/docs/configguide/installation.rst b/docs/configguide/featureconfig.rst
index ae67a94..1cbb56e 100755
--- a/docs/configguide/installation.rst
+++ b/docs/configguide/featureconfig.rst
@@ -2,7 +2,6 @@
.. http://creativecommons.org/licenses/by/4.0
.. Copyright (c) 2016 Open Platform for NFV Project, Inc. and its contributors
-=============================
Installing OVSNFV Fuel Plugin
=============================
diff --git a/docs/configguide/index.rst b/docs/configguide/index.rst
index 6f84c19..70bb4a4 100644
--- a/docs/configguide/index.rst
+++ b/docs/configguide/index.rst
@@ -2,12 +2,13 @@
.. http://creativecommons.org/licenses/by/4.0
.. Copyright (c) 2016 Open Platform for NFV Project, Inc. and its contributors
-******************************
+==============================
OVSNFV Guides and Installation
-******************************
+==============================
.. toctree::
:numbered:
:maxdepth: 3
- installation.rst
+ featureconfig.rst
+
diff --git a/docs/index.rst b/docs/index.rst
index 4721498..8b6fe79 100755
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -7,6 +7,7 @@
====================
Open vSwitch for NFV
====================
+
Welcome to OVSNFV's documentation!
OVSNFV is an OPNFV collaborative development project.
diff --git a/docs/release/NEWS.rst b/docs/release/NEWS.rst
index a4c62ea..4e87aa0 100755
--- a/docs/release/NEWS.rst
+++ b/docs/release/NEWS.rst
@@ -6,3 +6,4 @@ January 2016
============
- Initial Release of OVSNFV Fuel Plugin.
+
diff --git a/docs/release/index.rst b/docs/release/index.rst
index b130db5..9af026a 100644
--- a/docs/release/index.rst
+++ b/docs/release/index.rst
@@ -2,9 +2,9 @@
.. http://creativecommons.org/licenses/by/4.0
.. Copyright (c) 2016 Open Platform for NFV Project, Inc. and its contributors
-***********
+===========
OVSNFV News
-***********
+===========
.. toctree::
:numbered:
diff --git a/docs/userguide/quickstart.rst b/docs/userguide/featureusage.rst
index d8cbe60..d948d69 100755
--- a/docs/userguide/quickstart.rst
+++ b/docs/userguide/featureusage.rst
@@ -2,7 +2,6 @@
.. http://creativecommons.org/licenses/by/4.0
.. Copyright (c) 2016 Open Platform for NFV Project, Inc. and its contributors
-============
Open vSwitch
============
@@ -10,14 +9,13 @@ Open vSwtich (OVS) is a software switch commonly used in OpenStack deployments
to replace Linux bridges as it offers advantages in terms of mobility, hardware
integration and use by network controllers.
-================
-OPNFV Installers
-================
+Supported OPNFV Installers
+--------------------------
Currently not all installers are supported.
Fuel Installer
---------------
+~~~~~~~~~~~~~~
OVSNFV project supplies a Fuel Plugin to upgrades Open vSwitch on an OPNFV
installation to use user-space datapath.
diff --git a/docs/userguide/index.rst b/docs/userguide/index.rst
index c2f593d..7181e5b 100644
--- a/docs/userguide/index.rst
+++ b/docs/userguide/index.rst
@@ -2,12 +2,13 @@
.. http://creativecommons.org/licenses/by/4.0
.. Copyright (c) 2016 Open Platform for NFV Project, Inc. and its contributors
-******************************
+==============================
OVSNFV Guides and Installation
-******************************
+==============================
.. toctree::
:numbered:
:maxdepth: 3
- quickstart.rst
+ featureusage.rst
+
diff --git a/fuel-plugin-ovsnfv/ovs_package/ubuntu/dependencies.txt b/fuel-plugin-ovsnfv/ovs_package/ubuntu/dependencies.txt
index ad57495..18987a0 100644
--- a/fuel-plugin-ovsnfv/ovs_package/ubuntu/dependencies.txt
+++ b/fuel-plugin-ovsnfv/ovs_package/ubuntu/dependencies.txt
@@ -79,6 +79,7 @@ http://archive.ubuntu.com/ubuntu/pool/main/n/numactl/libnuma-dev_2.0.9~rc5-1ubun
https://pypi.python.org/packages/source/l/libvirt-python/libvirt-python-1.2.12.tar.gz
http://archive.ubuntu.com/ubuntu/pool/main/libg/libgpg-error/libgpg-error-dev_1.12-0.2ubuntu1_amd64.deb
http://archive.ubuntu.com/ubuntu/pool/main/libg/libgcrypt11/libgcrypt11-dev_1.5.3-2ubuntu4.3_amd64.deb
+http://archive.ubuntu.com/ubuntu/pool/main/libg/libgcrypt11/libgcrypt11_1.5.3-2ubuntu4.3_amd64.deb
http://archive.ubuntu.com/ubuntu/pool/main/z/zlib/zlib1g-dev_1.2.8.dfsg-1ubuntu1_amd64.deb
http://archive.ubuntu.com/ubuntu/pool/main/libt/libtasn1-6/libtasn1-6-dev_3.4-3ubuntu0.3_amd64.deb
http://archive.ubuntu.com/ubuntu/pool/main/p/p11-kit/libp11-kit-dev_0.20.2-2ubuntu2_amd64.deb