summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-06-08 19:10:00 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-06-25 16:41:13 +0200
commita635b48fee2701e495307de0af6d4eab510e84fb (patch)
tree7609f3433b11820f02a74a331424cbbe4c8bd9b1 /docs
parent3ed2d8dab3d75628cd1f7edd47051623c643592c (diff)
[noha] Adopt vPDF usage
Previously, all virtual deployments relied on lab configuration from <./mcp/config> using 'local-virtual1' as POD name. To keep using that default sample config, one can still pass the appropiate arguments to <ci/deploy.sh> as in: $ ./ci/deploy.sh -l local -p virtual1 [...] This changed introduces support for vPOD-specific lab config, e.g.: $ ./ci/deploy.sh -l ericsson -p virtual4 Change-Id: I6ecb8e71d7e923e4b29b4ab0693c1afa5e19b582 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'docs')
-rw-r--r--docs/release/installation/installation.instruction.rst30
1 files changed, 23 insertions, 7 deletions
diff --git a/docs/release/installation/installation.instruction.rst b/docs/release/installation/installation.instruction.rst
index 94d67c193..a90a10d48 100644
--- a/docs/release/installation/installation.instruction.rst
+++ b/docs/release/installation/installation.instruction.rst
@@ -228,8 +228,8 @@ create a new sources list file `/apt/sources.list.d/armband.list` with the follo
.. code-block:: bash
$ cat /etc/apt/sources.list.d/armband.list
- //for OpenStack Pike release
- deb http://linux.enea.com/mcp-repos/pike/xenial pike-armband main
+ //for OpenStack Queens release
+ deb http://linux.enea.com/mcp-repos/queens/xenial queens-armband main
$ apt-get update
@@ -412,6 +412,11 @@ These steps are common both for virtual and baremetal deploys.
-D \
-S <Storage directory for disk images> |& tee deploy.log
+ **NOTE**: The deployment uses the OPNFV Pharos project as input (PDF and IDF files)
+ for hardware and network configuration of all current OPNFV PODs.
+ When deploying a new POD, one can pass the `-b` flag to the deploy script to override
+ the path for the labconfig directory structure containing the PDF and IDF (see below).
+
Examples
--------
#. Virtual deploy
@@ -434,6 +439,19 @@ Examples
available at http://<controller VIP>:8078
The administrator credentials are **admin** / **opnfv_secret**.
+ A simple (and generic) sample PDF/IDF set of configuration files may
+ be used for virtual deployments by setting lab/POD name to 'local-virtual1'.
+ This sample configuration is x86_64 specific and hardcodes certain parameters,
+ like public network address space, so a dedicated PDF/IDF is highly recommended.
+
+ .. code-block:: bash
+
+ $ ci/deploy.sh -l local \
+ -p virtual1 \
+ -s os-nosdn-nofeature-noha \
+ -D \
+ -S /home/jenkins/tmpdir |& tee deploy.log
+
#. Baremetal deploy
A x86 deploy on pod2 from Linux Foundation lab
@@ -471,10 +489,8 @@ Examples
Once the deployment is complete, the SaltStack Deployment Documentation is
available at http://<proxy public VIP>:8090
-**NOTE**: The deployment uses the OPNFV Pharos project as input (PDF and IDF files)
-for hardware and network configuration of all current OPNFV PODs.
-When deploying a new POD, one can pass the `-b` flag to the deploy script to override
-the path for the labconfig directory structure containing the PDF and IDF.
+ When deploying a new POD, one can pass the `-b` flag to the deploy script to override
+ the path for the labconfig directory structure containing the PDF and IDF.
.. code-block:: bash
@@ -582,7 +598,7 @@ OPNFV
OpenStack
-4) `OpenStack Pike Release Artifacts <http://www.openstack.org/software/pike>`_
+4) `OpenStack Queens Release Artifacts <http://www.openstack.org/software/queens>`_
5) `OpenStack Documentation <http://docs.openstack.org>`_
OpenDaylight