Skip to content

Commit

Permalink
next
Browse files Browse the repository at this point in the history
  • Loading branch information
@jimmccarron
jimmccarron committed Nov 10, 2024
1 parent c19b3de commit a691dcd
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion docs/automating_rseries.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ Terraform providers have been created for F5OS for some of the more common tasks

The github location of the Terraform provider files is at the following location.

`Terraform Provider F5OS v1.3.0 <https://github.com/F5Networks/terraform-provider-F5OS/releases>`_
`Terraform Provider F5OS v1.4.0 <https://github.com/F5Networks/terraform-provider-F5OS/releases>`_

Getting Started with F5OS Automation
====================================
Expand Down
Binary file added docs/images/rseries_security/screenshot.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
30 changes: 15 additions & 15 deletions docs/rseries_deploying_a_bigip_next_tenant.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,35 +31,35 @@ Although F5OS-A 1.8.0/1.8.1 adds support for BIG-IP Next on specific rSeries pla
+--------------+------------------------+-----------------------------------------------------------------------------------------+--------------------------------------------------------+-------------------------------------------+
| Platform | # of vCPUs for Tenants | Supported vCPUs for BIG-IP Tenants | Supported vCPUs for BIG-IP Next Tenants (F5OS-A 1.8.0) | Maximum # of BIG-IP Next Tenants |
+==============+========================+=========================================================================================+========================================================+===========================================+
| r2600 | 4 | 4 | 4 / 2,4 (F5OS-A 2.0) | 1 |
| r2600 | 4 | 4 | 4 | 1 |
+--------------+------------------------+-----------------------------------------------------------------------------------------+--------------------------------------------------------+-------------------------------------------+
| r2800 | 8 | 4,8 | 4,8 / 2,4,8 (F5OS-A 2.0) | 1 (F5OS-A 1.8.0), 2 (F5OS 1.8.1) |
| r2800 | 8 | 4,8 | 4,8 | 1 |
+--------------+------------------------+-----------------------------------------------------------------------------------------+--------------------------------------------------------+-------------------------------------------+
| r4600 | 12 | 4,8,12 | 4,8 / 2,4,8 (F5OS-A 2.0) | 1 (F5OS-A 1.8.0), 2 (F5OS 1.8.1) |
| r4600 | 12 | 4,8,12 | 4,8 | 1 |
+--------------+------------------------+-----------------------------------------------------------------------------------------+--------------------------------------------------------+-------------------------------------------+
| r4800 | 16 | 4,8,12,16 | 4,8,16 / 2,4,8,16 (F5OS-A 2.0) | 1 (F5OS-A 1.8.0), 4 (F5OS 1.8.1) |
| r4800 | 16 | 4,8,12,16 | 4,8,16 | 1 |
+--------------+------------------------+-----------------------------------------------------------------------------------------+--------------------------------------------------------+-------------------------------------------+
| r5600 | 12 | 1,2,4,6,8,10,12 | 4,8,12 / 2,4,8,12 (F5OS-A 2.0) | 2 (20.3), 3 (20.4), 6 (F5OS-A 2.0) |
| r5600 | 12 | 1,2,4,6,8,10,12 | 4,8,12 | 2 |
+--------------+------------------------+-----------------------------------------------------------------------------------------+--------------------------------------------------------+-------------------------------------------+
| r5800 | 18 | 1,2,4,6,8,10,12,14,16,18 | 4,8,12,18 / 2,4,8,12,18 (F5OS-A 2.0) | 2 (20.3), 4 (20.4), 7 (F5OS-A 2.0) |
| r5800 | 18 | 1,2,4,6,8,10,12,14,16,18 | 4,8,12,18 | 2 |
+--------------+------------------------+-----------------------------------------------------------------------------------------+--------------------------------------------------------+-------------------------------------------+
| r5900 | 26 | 1,2,4,6,8,10,12,14,16,18,20,22,24,26 | 4,8,12,18,26 / 2,4,8,12,18,26 (F5OS-A 2.0) | 2 (20.3), 5 (20.4), 7 (F5OS-A 2.0) |
| r5900 | 26 | 1,2,4,6,8,10,12,14,16,18,20,22,24,26 | 4,8,12,18,26 | 2 |
+--------------+------------------------+-----------------------------------------------------------------------------------------+--------------------------------------------------------+-------------------------------------------+
| r5920-DF | 26 | 1,2,4,6,8,10,12 | 4,8,12 (F5OS-A 1.8.1) | 2 (20.3), 5 (20.4), 7 (F5OS-A 2.0) |
| r5920-DF | 26 | 1,2,4,6,8,10,12 | N/A | N/A |
+--------------+------------------------+-----------------------------------------------------------------------------------------+--------------------------------------------------------+-------------------------------------------+
| r10600 | 24 | 1,2,4,6,8,10,12,14,16,18,20,22,24 | 4,8,24 / 2,4,8,24 (F5OS-A 2.0) | 2 (20.3), 5 (20.4), 7 (F5OS-A 2.0) |
| r10600 | 24 | 1,2,4,6,8,10,12,14,16,18,20,22,24 | 4,8,24 | 2 |
+--------------+------------------------+-----------------------------------------------------------------------------------------+--------------------------------------------------------+-------------------------------------------+
| r10800 | 28 | 1,2,4,6,8,10,12,14,16,18,20,22,24,26,28 | 4,8,24,28 / 2,4,8,24,28 (F5OS-A 2.0) | 2 (20.3), 5 (20.4), 7 (F5OS-A 2.0) |
| r10800 | 28 | 1,2,4,6,8,10,12,14,16,18,20,22,24,26,28 | 4,8,24,28 | 2 |
+--------------+------------------------+-----------------------------------------------------------------------------------------+--------------------------------------------------------+-------------------------------------------+
| r10900 | 36 | 1,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30,32,34,36 | 4,8,24,28,36 / 2,4,8,24,28,36 (F5OS-A 2.0) | 2 (20.3), 5 (20.4), 7 (F5OS-A 2.0) |
| r10900 | 36 | 1,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30,32,34,36 | 4,8,24,28,36 | 2 |
+--------------+------------------------+-----------------------------------------------------------------------------------------+--------------------------------------------------------+-------------------------------------------+
| r10920-DF | 36 | 1,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30,32,34,36 | 4,8,12 (F5OS-A 1.8.1) | 2 (20.3), 5 (20.4), 7 (F5OS-A 2.0) |
| r10920-DF | 36 | 1,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30,32,34,36 | N/A | N/A |
+--------------+------------------------+-----------------------------------------------------------------------------------------+--------------------------------------------------------+-------------------------------------------+
| r12600-DS | 44 | 1,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30,32,34,36,38,40,42,44 | 4,8,44 / 2,4,8,44 (F5OS-A 2.0) | 5 (20.3), 7 (20.4), 7 (F5OS-A 2.0) |
| r12600-DS | 44 | 1,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30,32,34,36,38,40,42,44 | 4,8,44 | 5 |
+--------------+------------------------+-----------------------------------------------------------------------------------------+--------------------------------------------------------+-------------------------------------------+
| r12800-DS | 52 | 1,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30,32,34,36,38,40,42,44,46,48,50,52 | 4,8,52 / 2,4,8,44,52 (F5OS-A 2.0) | 5 (20.3), 7 (20.4), 7 (F5OS-A 2.0) |
| r12800-DS | 52 | 1,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30,32,34,36,38,40,42,44,46,48,50,52 | 4,8,52 | 5 |
+--------------+------------------------+-----------------------------------------------------------------------------------------+--------------------------------------------------------+-------------------------------------------+
| r12900-DS | 60 | 1,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30,32,34,36,38,40,42,44,46,48,50,52,54,56,58,60 | 4,8,60 / 2,4,8,44,52,60 (F5OS-A 2.0) | 5 (20.3), 7 (20.4), 7 (F5OS-A 2.0) |
| r12900-DS | 60 | 1,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30,32,34,36,38,40,42,44,46,48,50,52,54,56,58,60 | 4,8,60 | 5 |
+--------------+------------------------+-----------------------------------------------------------------------------------------+--------------------------------------------------------+-------------------------------------------+


Expand Down
4 changes: 2 additions & 2 deletions docs/rseries_references.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ rSeries References

`F5OS-A/F5 rSeries Error Catalog <https://clouddocs.f5.com/f5os-error-catalog/rseries/rseries-errors-index.html>`_

`F5OS modules Ansible collection <https://clouddocs.f5.com/products/orchestration/ansible/devel/f5os/F5OS-index.html>`_
`F5OS Modules Ansible Collection <https://clouddocs.f5.com/products/orchestration/ansible/devel/f5os/F5OS-index.html>`_

`F5OS Provider Resources for Terraform <https://clouddocs.f5.com/products/orchestration/terraform/latest/F5OS/f5os-index.html#f5os-index>`_

`F5 rSeries and F5OS-A Hardware Platforms <https://techdocs.f5.com/kb/en-us/products/f5os-a/manuals/related/doc-f5os-a-f5-rseries.html#hardware>`_

`F5 rSeries Appliance Datasheet <https://www.f5.com/products/big-ip-services/rseries-adc-hardware-appliance>`_

`F5 Professional Services Ansible Collection <https://f5devcentral.github.io/f5-ps-ansible/>`_
`F5 Professional Services F5OS Ansible Collection <https://f5devcentral.github.io/f5-ps-ansible/>`_

0 comments on commit a691dcd

Please sign in to comment.