From 93ed07d69c2ca31e7c3da5cc674cacef13581bc7 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sun, 29 Oct 2017 21:25:11 +0100 Subject: docs: Add network layout example diagrams JIRA: FUEL-295 Change-Id: I3d7958951f1b37fe34dfaa28710a7f286a7a549a Signed-off-by: Alexandru Avadanii (cherry picked from commit b6527d709db68ce2847f34a368316878b9c6ff75) --- docs/release/installation/img/README.rst | 12 ++++ docs/release/installation/img/arm_pod5.png | Bin 0 -> 183371 bytes docs/release/installation/img/fuel_baremetal.png | Bin 0 -> 280791 bytes docs/release/installation/img/fuel_virtual.png | Bin 0 -> 216442 bytes docs/release/installation/img/lf_pod2.png | Bin 0 -> 185156 bytes .../installation/installation.instruction.rst | 79 ++++++++++++++------- 6 files changed, 65 insertions(+), 26 deletions(-) create mode 100644 docs/release/installation/img/README.rst create mode 100644 docs/release/installation/img/arm_pod5.png create mode 100644 docs/release/installation/img/fuel_baremetal.png create mode 100644 docs/release/installation/img/fuel_virtual.png create mode 100644 docs/release/installation/img/lf_pod2.png diff --git a/docs/release/installation/img/README.rst b/docs/release/installation/img/README.rst new file mode 100644 index 000000000..bc8d9bede --- /dev/null +++ b/docs/release/installation/img/README.rst @@ -0,0 +1,12 @@ +.. This work is licensed under a Creative Commons Attribution 4.0 International License. +.. SPDX-License-Identifier: CC-BY-4.0 +.. (c) 2017 Ericsson AB, Mirantis Inc., Enea AB and others. + +Image Editor +============ +All files in this directory have been created using `draw.io `_. + +Image Sources +============= +Image sources are embedded in each `png` file. +To edit an image, import the `png` file using `draw.io `_. diff --git a/docs/release/installation/img/arm_pod5.png b/docs/release/installation/img/arm_pod5.png new file mode 100644 index 000000000..4d38f808f Binary files /dev/null and b/docs/release/installation/img/arm_pod5.png differ diff --git a/docs/release/installation/img/fuel_baremetal.png b/docs/release/installation/img/fuel_baremetal.png new file mode 100644 index 000000000..3ef534d36 Binary files /dev/null and b/docs/release/installation/img/fuel_baremetal.png differ diff --git a/docs/release/installation/img/fuel_virtual.png b/docs/release/installation/img/fuel_virtual.png new file mode 100644 index 000000000..d7664865d Binary files /dev/null and b/docs/release/installation/img/fuel_virtual.png differ diff --git a/docs/release/installation/img/lf_pod2.png b/docs/release/installation/img/lf_pod2.png new file mode 100644 index 000000000..bc4ab5f84 Binary files /dev/null and b/docs/release/installation/img/lf_pod2.png differ diff --git a/docs/release/installation/installation.instruction.rst b/docs/release/installation/installation.instruction.rst index d48ca3032..88ca180bb 100644 --- a/docs/release/installation/installation.instruction.rst +++ b/docs/release/installation/installation.instruction.rst @@ -219,6 +219,12 @@ For virtual deploys all the targets are VMs on the Jumpserver. The deploy script - Install Openstack on the targets - Leverage Salt to install & configure Openstack services +.. figure:: img/fuel_virtual.png + :align: center + :alt: Fuel@OPNFV Virtual POD Network Layout Examples + + Fuel@OPNFV Virtual POD Network Layout Examples + Automatic Installation of a Baremetal POD ========================================= @@ -237,6 +243,12 @@ The installation is done automatically with the deploy script, which will: - Leverage Salt to configure the operatign system on the baremetal nodes - Leverage Salt to install & configure Openstack services +.. figure:: img/fuel_baremetal.png + :align: center + :alt: Fuel@OPNFV Baremetal POD Network Layout Example + + Fuel@OPNFV Baremetal POD Network Layout Example + Steps to Start the Automatic Deploy =================================== @@ -271,49 +283,64 @@ These steps are common both for virtual and baremetal deploys. $ ci/deploy.sh -l \ -p \ - -b \ + -b \ -s \ - -B + -B Examples -------- #. Virtual deploy -To start a virtual deployment, it is required to have the `virtual` keyword while specifying the pod name -to the installer script. It will create the required bridges and networks, configure Salt Master and install -OpenStack. + To start a virtual deployment, it is required to have the `virtual` keyword + while specifying the pod name to the installer script. - .. code-block:: bash + It will create the required bridges and networks, configure Salt Master and + install OpenStack. + + .. code-block:: bash - $ ci/deploy.sh -b file:///home/jenkins/tmpdir/securedlab \ - -l ericsson \ - -p virtual_kvm \ - -s os-nosdn-nofeature-noha + $ ci/deploy.sh -b file:///home/jenkins/tmpdir/securedlab \ + -l ericsson \ + -p virtual_kvm \ + -s os-nosdn-nofeature-noha -Once the deployment is complete, OpenStack Dashboard, Horizon is available at http://10.16.0.101:8078 -The administrator credentials are **admin** / **opnfv_secret**. + Once the deployment is complete, the OpenStack Dashboard, Horizon is + available at http://:8078, e.g. http://10.16.0.101:8078. + The administrator credentials are **admin** / **opnfv_secret**. #. Baremetal deploy -A x86 deploy on pod1 from Ericsson lab + A x86 deploy on pod2 from Linux Foundation lab - .. code-block:: bash + .. code-block:: bash - $ ci/deploy.sh -b file:///home/jenkins/tmpdir/securedlab \ - -l ericsson \ - -p pod1 \ - -s os-nosdn-nofeature-ha \ - -B pxebr + $ ci/deploy.sh -b file:///home/jenkins/tmpdir/securedlab \ + -l lf \ + -p pod2 \ + -s os-nosdn-nofeature-ha \ + -B pxebr,br-ctl -An aarch64 deploy on pod5 from Arm lab + .. figure:: img/lf_pod2.png + :align: center + :alt: Fuel@OPNFV LF POD2 Network Layout - .. code-block:: bash + Fuel@OPNFV LF POD2 Network Layout + + An aarch64 deploy on pod5 from Arm lab + + .. code-block:: bash + + $ ci/deploy.sh -b file:///home/jenkins/tmpdir/securedlab \ + -l arm \ + -p pod5 \ + -s os-nosdn-nofeature-ha \ + -B admin7_br0,mgmt7_br0,,public7_br0 + + .. figure:: img/arm_pod5.png + :align: center + :alt: Fuel@OPNFV ARM POD5 Network Layout - $ ci/deploy.sh -b file:///home/jenkins/tmpdir/securedlab \ - -l arm \ - -p pod5 \ - -s os-nosdn-nofeature-ha \ - -B pxebr + Fuel@OPNFV ARM POD5 Network Layout ============= -- cgit 1.2.3-korg