Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
jimmccarron committed Oct 10, 2023
2 parents 72712d6 + 74d9752 commit 8ab196b
Show file tree
Hide file tree
Showing 18 changed files with 94 additions and 59 deletions.
Binary file modified docs/images/initial_setup_of_rseries_network_layer/image1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/initial_setup_of_rseries_network_layer/image2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/initial_setup_of_rseries_platform_layer/image1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/initial_setup_of_rseries_platform_layer/image21.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/initial_setup_of_rseries_platform_layer/image24.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/initial_setup_of_rseries_platform_layer/image31.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/initial_setup_of_rseries_platform_layer/image32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/initial_setup_of_rseries_platform_layer/image34.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/initial_setup_of_rseries_platform_layer/image38.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/initial_setup_of_rseries_platform_layer/image4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/initial_setup_of_rseries_platform_layer/image5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/rseries_multitenancy/image8.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion docs/initial_setup_of_rseries_network_layer.rst
Original file line number Diff line number Diff line change
Expand Up @@ -964,7 +964,7 @@ Within the F5OS webUI, the physical ports of the appliance will be visible by go
:align: center
:scale: 70%

You can click on any interface to view its settings or edit them. You can currently change the interface state via the webUI or the **Native VLAN** (untagged) and **Trunk VLANs** (tagged) if the interface is not part of a LAG. If the interface is part of a LAG then the VLAN configuration is done within the LAG rather than the interface.
You can click on any interface to view its settings or edit them. You can currently change the interface state via the webUI or the **Native VLAN** (untagged) and **Trunk VLANs** (tagged) if the interface is not part of a LAG. If the interface is part of a LAG, then the VLAN configuration is done within the LAG rather than the interface.

.. image:: images/initial_setup_of_rseries_network_layer/image11.png
:align: center
Expand Down
8 changes: 4 additions & 4 deletions docs/initial_setup_of_rseries_platform_layer.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1161,7 +1161,7 @@ Log Settings
Under **System Settings > Log Settings** you may add remote log servers for the F5OS platform layer. You can also specify the **Software Component Log Levels** which may be useful when troubleshooting specific issues.
.. image:: images/initial_setup_of_rseries_platform_layer/image17.png
.. image:: images/initial_setup_of_rseries_platform_layer/image5.png
:align: center
:scale: 70%
Expand All @@ -1186,14 +1186,14 @@ Time Settings
Under the **System Settings > Time Settings** page Network Time Protocol servers can be added so that F5OS time sources are synchronized to a reliable time source. The Time can be set manually, and a Time Zone may also be set.
.. image:: images/initial_setup_of_rseries_platform_layer/image20.png
.. image:: images/initial_setup_of_rseries_platform_layer/image4.png
:align: center
:scale: 70%
Certificate Management
======================
Device certificates and keys used for device management can be created via the **Systems Settings > Device Certificates** page.
Device certificates and keys used for device management can be created via the **Authentication & Access > TLS Configuration** page.
.. image:: images/initial_setup_of_rseries_platform_layer/image21.png
:align: center
Expand All @@ -1211,7 +1211,7 @@ Device certificates and keys used for device management can be created via the *
System Reports
==============
The **System Settings > System Reports** page allows an admin to generate qkviews and optionally upload them to iHealth. To generate a qkview click on the button in the upper right-hand corner. It will take some time for the qkview to be generated.
The **Diagnostics > System Reports** page allows an admin to generate qkviews and optionally upload them to iHealth. To generate a qkview click on the button in the upper right-hand corner. It will take some time for the qkview to be generated.
.. image:: images/initial_setup_of_rseries_platform_layer/image24.png
:align: center
Expand Down
2 changes: 1 addition & 1 deletion docs/rseries_deploying_a_tenant.rst
Original file line number Diff line number Diff line change
Expand Up @@ -665,7 +665,7 @@ Below is the output from the above API call:
Resizing a Tenant
-----------------

rSeries tenants have static vCPU and memory allocations just like vCMP. These can be changed after a tenant has been deployed, but the tenant will have to be temporarily suspended (put in the **Provisioned** state), then the change to CPU and or memory allocation can be made. A tenant can be expanded assuming adequate resources are available. Once the changes are completed the tenant can be put into the **Deployed** state and returned to service.
rSeries tenants have static vCPU and memory allocations just like vCMP. These can be changed after a tenant has been deployed, but the tenant will have to be suspended (put in the **Provisioned** state), then the change to CPU and or memory allocation can be made. A tenant can be expanded assuming adequate resources are available. Once the changes are completed the tenant can be put into the **Deployed** state and returned to service.

Expanding a Tenant via webUI
--------------------------
Expand Down
6 changes: 3 additions & 3 deletions docs/rseries_multitenancy.rst
Original file line number Diff line number Diff line change
Expand Up @@ -101,11 +101,11 @@ For the r2000 / r4000 appliances the formula is different.
+-----------------------+-----------------------+-------------------------+----------------------------------+------------------------------------+---------------------------------------+-------------+
| **rSeries Platform** | **Memory per System** | **Memory use by F5OS** | **Memory Available to Tenants** | **Minimum RAM used (Max vCPU)** | **Extra RAM Available for Tenants** | Max vCPUs |
+=======================+=======================+=========================+==================================+====================================+=======================================+=============+
| r12900-DS Series | 512GB RAM | TBD | TBD | 211GB | TBD | 60 |
| r12900-DS Series | 512GB RAM | 42GB | 470GB | 211GB | 259GB | 60 |
+-----------------------+-----------------------+-------------------------+----------------------------------+------------------------------------+---------------------------------------+-------------+
| r12800-DS Series | 512GB RAM | TBD | TBD | 183GB | TBD | 52 |
| r12800-DS Series | 512GB RAM | 42GB | 470GB | 183GB | 287GB | 52 |
+-----------------------+-----------------------+-------------------------+----------------------------------+------------------------------------+---------------------------------------+-------------+
| r12600-DS Series | 512GB RAM | TBD | TBD | 155GB | TBD | 44 |
| r12600-DS Series | 512GB RAM | 42GB | 470GB | 155GB | 315GB | 44 |
+-----------------------+-----------------------+-------------------------+----------------------------------+------------------------------------+---------------------------------------+-------------+
| r10900 Series | 256GB RAM | 25GB | 231GB | 127GB | 104GB | 36 |
+-----------------------+-----------------------+-------------------------+----------------------------------+------------------------------------+---------------------------------------+-------------+
Expand Down
6 changes: 4 additions & 2 deletions docs/rseries_networking.rst
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,13 @@ Supported Optics

Only F5 branded optics are officially supported on rSeries appliances. On rSeries r2000/r4000 models speeds of 1Gb, 10Gb, or 25Gb are supported. On the r5000/r10000 models speeds of 10Gb, 25Gb, 40Gb, or 100Gb are supported depending on the type of optics used and the port group configuration. Note the r5000/r10000 appliances do not support 1Gb connectivity. rSeries high speed interfaces will accept F5 approved QSFP+ & QSFP28 optics, while low speed ports will accept SFP28 and SFP+ optics. None of the optics support dual mode speeds i.e., 25Gb/10Gb, you must have the right optic and port group configuration for the speed you want to run. 3rd party optics are not officially supported per F5’s support policies:

https://support.f5.com/csp/article/K8153.


`K8153: F5 support of third-party hardware components <https://my.f5.com/manage/s/article/K8153>_`

More details on each optic can be found in the F5 Platforms Accessories guide:

https://techdocs.f5.com/en-us/hw-platforms/f5-plat-accessories.html
`F5 Platforms: Accessories <https://techdocs.f5.com/en-us/hw-platforms/f5-plat-accessories.html>_`


Supported rSeries Optics SKU's
Expand Down
Loading

0 comments on commit 8ab196b

Please sign in to comment.