Various improvements
- Remove beta from SD-Fabric related pages
- Move switch Aether to SD-Fabric doc
- Move fabric switch provision to SD-Fabric doc
- Move fabric troubleshooting guid to SD-Fabric doc
Change-Id: I456703092fc9b4973ef89e7854c8b7b976e96b7e
diff --git a/edge_deployment/fabric_switch_bootstrap.rst b/edge_deployment/fabric_switch_bootstrap.rst
index d40a878..3dad67a 100644
--- a/edge_deployment/fabric_switch_bootstrap.rst
+++ b/edge_deployment/fabric_switch_bootstrap.rst
@@ -2,20 +2,14 @@
SPDX-FileCopyrightText: © 2020 Open Networking Foundation <support@opennetworking.org>
SPDX-License-Identifier: Apache-2.0
-Fabric Switch Bootstrap (Beta)
-==============================
-
-.. note::
-
- Fabric switches running the P4 UPF is a beta feature of the Aether 1.5
- release, and the hardware and software setup is not required if using the
- BESS UPF.
+Fabric Switch Bootstrap
+=======================
The installation of the ONL OS image on the fabric switches uses the DHCP and
HTTP server set up on the management server.
The default image is downloaded during that installation process by the
-``onieboot`` role. Make changes to that roll and rerun the management playbook
+``onieboot`` role. Make changes to that role and rerun the management playbook
to download a newer switch image.
Preparation
@@ -25,109 +19,12 @@
ONL. Find out the MAC addresses for both of these ports and enter it into
NetBox.
-Change boot mode to ONIE Rescue mode
-------------------------------------
+Installing Open Network Linux
+-----------------------------
+See :ref:`Provision Switches <sdfabric:deployment:step 1: provision switches>`
+to learn about how to enter ONIE Rescue mode and install Open Network Linux on the switches.
-In order to reinstall an ONL image, you must change the ONIE bootloader to
-"Rescue Mode".
-
-Once the switch is powered on, it should retrieve an IP address on the OpenBMC
-interface with DHCP. OpenBMC uses these default credentials::
-
- username: root
- password: 0penBmc
-
-Login to OpenBMC with SSH::
-
- $ ssh root@10.0.0.131
- The authenticity of host '10.0.0.131 (10.0.0.131)' can't be established.
- ECDSA key fingerprint is SHA256:...
- Are you sure you want to continue connecting (yes/no)? yes
- Warning: Permanently added '10.0.0.131' (ECDSA) to the list of known hosts.
- root@10.0.0.131's password:
- root@bmc:~#
-
-Using the Serial-over-LAN Console, enter ONL::
-
- root@bmc:~# /usr/local/bin/sol.sh
- You are in SOL session.
- Use ctrl-x to quit.
- -----------------------
-
- root@onl:~#
-
-.. note::
- If `sol.sh` is unresponsive, please try to restart the mainboard with::
-
- root@onl:~# wedge_power.sh reset
-
-
-Change the boot mode to rescue mode with the command ``onl-onie-boot-mode
-rescue``, and reboot::
-
- root@onl:~# onl-onie-boot-mode rescue
- [1053033.768512] EXT4-fs (sda2): mounted filesystem with ordered data mode. Opts: (null)
- [1053033.936893] EXT4-fs (sda3): re-mounted. Opts: (null)
- [1053033.996727] EXT4-fs (sda3): re-mounted. Opts: (null)
- The system will boot into ONIE rescue mode at the next restart.
- root@onl:~# reboot
-
-At this point, ONL will go through it's shutdown sequence and ONIE will start.
-If it does not start right away, press the Enter/Return key a few times - it
-may show you a boot selection screen. Pick ``ONIE`` and ``Rescue`` if given a
-choice.
-
-Installing an ONL image over HTTP
----------------------------------
-
-Now that the switch is in Rescue mode
-
-First, activate the Console by pressing Enter::
-
- discover: Rescue mode detected. Installer disabled.
-
- Please press Enter to activate this console.
- To check the install status inspect /var/log/onie.log.
- Try this: tail -f /var/log/onie.log
-
- ** Rescue Mode Enabled **
- ONIE:/ #
-
-Then run the ``onie-nos-install`` command, with the URL of the management
-server on the management network segment::
-
- ONIE:/ # onie-nos-install http://10.0.0.129/onie-installer
- discover: Rescue mode detected. No discover stopped.
- ONIE: Unable to find 'Serial Number' TLV in EEPROM data.
- Info: Fetching http://10.0.0.129/onie-installer ...
- Connecting to 10.0.0.129 (10.0.0.129:80)
- installer 100% |*******************************| 322M 0:00:00 ETA
- ONIE: Executing installer: http://10.0.0.129/onie-installer
- installer: computing checksum of original archive
- installer: checksum is OK
- ...
-
-The installation will now start, and then ONL will boot culminating in::
-
- Open Network Linux OS ONL-wedge100bf-32qs, 2020-11-04.19:44-64100e9
-
- localhost login:
-
-The default ONL login is::
-
- username: root
- password: onl
-
-If you login, you can verify that the switch is getting it's IP address via
-DHCP::
-
- root@localhost:~# ip addr
- ...
- 3: ma1: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc mq state UP group default qlen 1000
- link/ether 00:90:fb:5c:e1:97 brd ff:ff:ff:ff:ff:ff
- inet 10.0.0.130/25 brd 10.0.0.255 scope global ma1
- ...
-
+Please return here and continue the rest of the step once you finish ONL installation.
Post-ONL Configuration
----------------------
diff --git a/edge_deployment/overview.rst b/edge_deployment/overview.rst
index ff61e7f..f44ae51 100644
--- a/edge_deployment/overview.rst
+++ b/edge_deployment/overview.rst
@@ -142,35 +142,7 @@
Fabric Switch
"""""""""""""
-
-To use the P4 UPF, you must use fabric switches based on the `Intel (previously
-Barefoot) Tofino chipset
-<https://www.intel.com/content/www/us/en/products/network-io/programmable-ethernet-switch/tofino-series.html>`_.
-There are two variants of this switching chipset, with different resources and
-capabilities.
-
-Aether currently supports these P4 switch models:
-
-* `EdgeCore Wedge100BF-32X
- <https://www.edge-core.com/productsInfo.php?cls=1&cls2=180&cls3=181&id=335>`_,
- a Dual Pipe Tofino ASIC
-
-* `EdgeCore Wedge100BF-32QS
- <https://www.edge-core.com/productsInfo.php?cls=1&cls2=180&cls3=181&id=770>`_,
- a Quad Pipe Tofino ASIC, which has more chip resources and a faster embedded
- system with more memory and storage.
-
-The P4 UPF and SD-Fabric features run within the constraints of the Dual Pipe
-system for production deployments, but for development of features in P4, the
-larger capacity of the Quad Pipe is desirable.
-
-These switches feature 32 QSFP+ ports capable of running in 100GbE, 40GbE, or
-4x 10GbE mode (using a split DAC or fiber cable) and have a 1GbE management
-network interface.
-
-See also the :ref:`Rackmount of Equipment
-<edge_deployment/site_planning:rackmount of equipment>` for how the Fabric
-switches should be rackmounted to ensure proper airflow within a rack.
+See :ref:`Switch Hardware Selection <sdfabric:deployment:switch hardware selection>`
Compute Server
""""""""""""""
diff --git a/edge_deployment/sdfabric_deployment.rst b/edge_deployment/sdfabric_deployment.rst
index 12f1ad6..480e4db 100644
--- a/edge_deployment/sdfabric_deployment.rst
+++ b/edge_deployment/sdfabric_deployment.rst
@@ -2,13 +2,8 @@
SPDX-FileCopyrightText: © 2020 Open Networking Foundation <support@opennetworking.org>
SPDX-License-Identifier: Apache-2.0
-SD-Fabric Deployment (Beta)
-===========================
-
-.. note::
-
- SD-Fabric using the P4 UPF is a beta feature in the Aether 1.5 release, and
- the hardware and software setup is not required if using the BESS UPF.
+SD-Fabric Deployment
+====================
Update aether-pod-configs
-------------------------
diff --git a/edge_deployment/troubleshooting.rst b/edge_deployment/troubleshooting.rst
index ad44794..9522b0c 100644
--- a/edge_deployment/troubleshooting.rst
+++ b/edge_deployment/troubleshooting.rst
@@ -142,24 +142,14 @@
eno2 10:4f:58:e7:d5:60 Aruba-2540-24…PP ..b........ 1 1
-Problems with ONIE Installation
--------------------------------
-
-Can't reboot into ONL, loops on ONIE installer mode
-"""""""""""""""""""""""""""""""""""""""""""""""""""
-
-Sometimes an ONL installation is incomplete or problematic, and reinstalling it
-doesn't result in a working system.
-
-If this is the case, reboot into ONIE Rescue mode and use ``parted`` to delete
-all the ``ONL-`` prefixed partitions, then reinstall with an ``onie-installer``
-image.
-
+Problems with SD-Fabric
+-----------------------
+Refer to :ref:`SD-Fabric Troubleshooting Guide <sdfabric:troubleshooting:Troubleshooting Guide>`
+for SD-Fabric related issues.
Management Network Issues
-------------------------
-
Cycling PoE port power on a HP/Aruba Management switch
""""""""""""""""""""""""""""""""""""""""""""""""""""""