From 259a06c04e0cd223fca1fd54c91c6d8a134ffa7f Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Mon, 21 Sep 2020 19:25:17 +0000 Subject: [PATCH 01/23] Add header for router service offering --- source/adminguide/service_offerings.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/source/adminguide/service_offerings.rst b/source/adminguide/service_offerings.rst index 93c84f5557..28f0b31e03 100644 --- a/source/adminguide/service_offerings.rst +++ b/source/adminguide/service_offerings.rst @@ -697,3 +697,8 @@ default system offering used for System VMs. #. Destroy the existing CPVM or SSVM offerings and wait for them to be recreated. The new CPVM or SSVM are configured with the new offering. + +Changing the Default System Offering for Virtual Routers +--------------------------------------------------- + + From 5e328684fd2afb6654f5a8d1b6e8da51745d57db Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Fri, 11 Feb 2022 11:49:22 +0100 Subject: [PATCH 02/23] Add content --- .../networking/manage_guest_networks.rst | 44 +++++++++++++++++++ source/adminguide/networking_and_traffic.rst | 2 + source/adminguide/service_offerings.rst | 43 ++++++++++++++++++ source/installguide/configuration.rst | 1 + 4 files changed, 90 insertions(+) create mode 100644 source/adminguide/networking/manage_guest_networks.rst diff --git a/source/adminguide/networking/manage_guest_networks.rst b/source/adminguide/networking/manage_guest_networks.rst new file mode 100644 index 0000000000..70f75916d2 --- /dev/null +++ b/source/adminguide/networking/manage_guest_networks.rst @@ -0,0 +1,44 @@ +.. Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information# + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + + +Editing, Restarting, and Removing a Guest Network +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +.. note:: Ensure that all the vms are removed before you remove a guest network. + +#. Log in to the CloudStack UI as an administrator or end user. + +#. In the left navigation, choose Network. + +#. In the Select view, select Guest networks. + + All the guest networks that you have created for the account is listed in the + page. + +#. Select the guest network you want to work with. + +#. In the Details tab, click the "Delete Network" button + + You can remove the guest network by also using the remove button in the Quick + View. + + You can edit the name, description, network offering, CIDR, network domain of a + guest network. To do that, click the "Edit" button. + + To restart a guest network, click the "Restart network" button. Please note + all services provided by this network will be interrupted. When you check "Clean up", + the virtual routers of guest network will be destroyed and new virtual routers will + be provisioned. diff --git a/source/adminguide/networking_and_traffic.rst b/source/adminguide/networking_and_traffic.rst index c0fbe69f03..d6aa253cfc 100644 --- a/source/adminguide/networking_and_traffic.rst +++ b/source/adminguide/networking_and_traffic.rst @@ -29,6 +29,8 @@ providing networking features for guest traffic. .. include:: networking/advanced_zone_config.rst +.. include:: networking/manage_guest_networks.rst + .. include:: networking/multiple_guest_networks.rst .. include:: networking/ip_reservation_in_guest_networks.rst diff --git a/source/adminguide/service_offerings.rst b/source/adminguide/service_offerings.rst index f0f41b90dc..0867cd3f04 100644 --- a/source/adminguide/service_offerings.rst +++ b/source/adminguide/service_offerings.rst @@ -726,4 +726,47 @@ default system offering used for System VMs. Changing the Default System Offering for Virtual Routers --------------------------------------------------- +Additionally, as a CloudStack administrator, you can change the +default system offering used for Virtual Routers. +#. Create a new system Offering + + For more information, see `“Creating a New System Offering” + `_. + +#. (Optional) Create a new network offering with System Offering + + For more information, see `“Creating a New Network Offering” + `_. + +#. (Optional) Change account setting + + You can change the default system offering for Virtual Routers of a particular + account by changing account settings "router.service.offering" to uuid of system offering. + + For more information, see `“Setting Local Configuration Parameters” + `_. + +#. (Optional) Change global configuration + + You can change the default system offering for Virtual Routers of all accounts + by changing global configuration "router.service.offering" to uuid of the system offering. + + For more information, see `“Setting Global Configuration Parameters” + `_. + +When you create a network, the virtual routers will use the system offering in Network Offering. +If it is not set, the virtual routers will use system offering in account setting. +If account setting is not set, the virtual routers will use system offering in global configuration. +If global configuration is not set, the virtual routers will use the default system offering for virtual +routers ("System Offering For Software Router" or "System Offering For Software Router - Local Storage"). + + +For existing networks, you can update to a new network offering. For more information, see +`“Changing the Network Offering on a Guest Network” +`_. + +You can restart the network with cleanup. The new virtual routers will use the new system offering +set in Network Offering, account setting or global configuration. For more information, see +`“Editing, Restarting, and Removing a Guest Network” +`_. diff --git a/source/installguide/configuration.rst b/source/installguide/configuration.rst index 402e70a456..a6dc6285db 100644 --- a/source/installguide/configuration.rst +++ b/source/installguide/configuration.rst @@ -1619,6 +1619,7 @@ account remote.access.vpn.client.iprange The range o account allow.public.user.templates If false, users will not be able to create public templates. account use.system.public.ips If true and if an account has one or more dedicated public IP ranges, IPs are acquired from the system pool after all the IPs dedicated to the account have been consumed. account use.system.guest.vlans If true and if an account has one or more dedicated guest VLAN ranges, VLANs are allocated from the system pool after all the VLANs dedicated to the account have been consumed. +account router.service.offering Uuid of the service offering used by virtual routers; if NULL - system offering will be used cluster cluster.storage.allocated.capacity.notificationthreshold The percentage, as a value between 0 and 1, of allocated storage utilization above which alerts are sent that the storage is below the threshold. cluster cluster.storage.capacity.notificationthreshold The percentage, as a value between 0 and 1, of storage utilization above which alerts are sent that the available storage is below the threshold. cluster cluster.cpu.allocated.capacity.notificationthreshold The percentage, as a value between 0 and 1, of cpu utilization above which alerts are sent that the available CPU is below the threshold. From e0f2aaebbed12e547520a4e56aa820729d246131 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Fri, 11 Feb 2022 13:34:44 +0100 Subject: [PATCH 03/23] update --- .../networking/manage_guest_networks.rst | 2 +- source/adminguide/service_offerings.rst | 25 +++++++++---------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/source/adminguide/networking/manage_guest_networks.rst b/source/adminguide/networking/manage_guest_networks.rst index 70f75916d2..07ba58237b 100644 --- a/source/adminguide/networking/manage_guest_networks.rst +++ b/source/adminguide/networking/manage_guest_networks.rst @@ -15,7 +15,7 @@ Editing, Restarting, and Removing a Guest Network -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +-------------------------------------------------- .. note:: Ensure that all the vms are removed before you remove a guest network. diff --git a/source/adminguide/service_offerings.rst b/source/adminguide/service_offerings.rst index 0867cd3f04..3a673c730a 100644 --- a/source/adminguide/service_offerings.rst +++ b/source/adminguide/service_offerings.rst @@ -731,29 +731,29 @@ default system offering used for Virtual Routers. #. Create a new system Offering - For more information, see `“Creating a New System Offering” - `_. + For more information, see `“Creating a New System Offering” + `_. #. (Optional) Create a new network offering with System Offering - For more information, see `“Creating a New Network Offering” - `_. + For more information, see `“Creating a New Network Offering” + `_. #. (Optional) Change account setting - You can change the default system offering for Virtual Routers of a particular - account by changing account settings "router.service.offering" to uuid of system offering. + You can change the default system offering for Virtual Routers of a particular + account by changing account settings "router.service.offering" to uuid of system offering. - For more information, see `“Setting Local Configuration Parameters” - `_. + For more information, see `“Setting Local Configuration Parameters” + `_. #. (Optional) Change global configuration - You can change the default system offering for Virtual Routers of all accounts - by changing global configuration "router.service.offering" to uuid of the system offering. + You can change the default system offering for Virtual Routers of all accounts + by changing global configuration "router.service.offering" to uuid of the system offering. - For more information, see `“Setting Global Configuration Parameters” - `_. + For more information, see `“Setting Global Configuration Parameters” + `_. When you create a network, the virtual routers will use the system offering in Network Offering. If it is not set, the virtual routers will use system offering in account setting. @@ -761,7 +761,6 @@ If account setting is not set, the virtual routers will use system offering in g If global configuration is not set, the virtual routers will use the default system offering for virtual routers ("System Offering For Software Router" or "System Offering For Software Router - Local Storage"). - For existing networks, you can update to a new network offering. For more information, see `“Changing the Network Offering on a Guest Network” `_. From 0fa46cf7c50d9239e0c79d75e7278a3bd7500085 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Fri, 11 Feb 2022 13:44:05 +0100 Subject: [PATCH 04/23] update 2 --- source/adminguide/service_offerings.rst | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/source/adminguide/service_offerings.rst b/source/adminguide/service_offerings.rst index 3a673c730a..b3c3a3e903 100644 --- a/source/adminguide/service_offerings.rst +++ b/source/adminguide/service_offerings.rst @@ -745,7 +745,7 @@ default system offering used for Virtual Routers. account by changing account settings "router.service.offering" to uuid of system offering. For more information, see `“Setting Local Configuration Parameters” - `_. + <../installguide/configuration.html#setting-local-configuration-parameters>`_. #. (Optional) Change global configuration @@ -753,7 +753,7 @@ default system offering used for Virtual Routers. by changing global configuration "router.service.offering" to uuid of the system offering. For more information, see `“Setting Global Configuration Parameters” - `_. + <../installguide/configuration.html#setting-global-configuration-parameters>`_. When you create a network, the virtual routers will use the system offering in Network Offering. If it is not set, the virtual routers will use system offering in account setting. @@ -761,11 +761,12 @@ If account setting is not set, the virtual routers will use system offering in g If global configuration is not set, the virtual routers will use the default system offering for virtual routers ("System Offering For Software Router" or "System Offering For Software Router - Local Storage"). -For existing networks, you can update to a new network offering. For more information, see -`“Changing the Network Offering on a Guest Network” +You can update an existing network to a new network offering. The new virtual routers will use the +new system offering set in Network Offering, account setting or global configuration. +For more information, see `“Changing the Network Offering on a Guest Network” `_. You can restart the network with cleanup. The new virtual routers will use the new system offering -set in Network Offering, account setting or global configuration. For more information, see -`“Editing, Restarting, and Removing a Guest Network” +set in Network Offering, account setting or global configuration. +For more information, see `“Editing, Restarting, and Removing a Guest Network” `_. From 10300a184621b154b2d382852ed62853333d318a Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Fri, 11 Feb 2022 15:48:16 +0100 Subject: [PATCH 05/23] Update source/adminguide/service_offerings.rst Co-authored-by: dahn --- source/adminguide/service_offerings.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/adminguide/service_offerings.rst b/source/adminguide/service_offerings.rst index b3c3a3e903..46dbe64459 100644 --- a/source/adminguide/service_offerings.rst +++ b/source/adminguide/service_offerings.rst @@ -726,8 +726,8 @@ default system offering used for System VMs. Changing the Default System Offering for Virtual Routers --------------------------------------------------- -Additionally, as a CloudStack administrator, you can change the -default system offering used for Virtual Routers. +As a CloudStack administrator, you can change the default system +offering used for Virtual Routers. #. Create a new system Offering From d30d6b488720d000e7a46a8fadf9f387ccac40cd Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Fri, 11 Feb 2022 15:48:21 +0100 Subject: [PATCH 06/23] Update source/adminguide/service_offerings.rst Co-authored-by: dahn --- source/adminguide/service_offerings.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/adminguide/service_offerings.rst b/source/adminguide/service_offerings.rst index 46dbe64459..f0374ad706 100644 --- a/source/adminguide/service_offerings.rst +++ b/source/adminguide/service_offerings.rst @@ -729,7 +729,7 @@ Changing the Default System Offering for Virtual Routers As a CloudStack administrator, you can change the default system offering used for Virtual Routers. -#. Create a new system Offering +#. Create a new system offering For more information, see `“Creating a New System Offering” `_. From b831d61f208b1060a9824eea27b125dce085dfd2 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Fri, 11 Feb 2022 15:48:44 +0100 Subject: [PATCH 07/23] Update source/adminguide/service_offerings.rst Co-authored-by: dahn --- source/adminguide/service_offerings.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/adminguide/service_offerings.rst b/source/adminguide/service_offerings.rst index f0374ad706..cba79d1054 100644 --- a/source/adminguide/service_offerings.rst +++ b/source/adminguide/service_offerings.rst @@ -742,7 +742,8 @@ offering used for Virtual Routers. #. (Optional) Change account setting You can change the default system offering for Virtual Routers of a particular - account by changing account settings "router.service.offering" to uuid of system offering. + account by changing the account's setting "router.service.offering" to the uuid + of the system offering. For more information, see `“Setting Local Configuration Parameters” <../installguide/configuration.html#setting-local-configuration-parameters>`_. From fd0c5cfecabc5c5c94370e8cd20a5ee4720b68ee Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Fri, 11 Feb 2022 15:48:51 +0100 Subject: [PATCH 08/23] Update source/adminguide/service_offerings.rst Co-authored-by: dahn --- source/adminguide/service_offerings.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/adminguide/service_offerings.rst b/source/adminguide/service_offerings.rst index cba79d1054..0a55d529c2 100644 --- a/source/adminguide/service_offerings.rst +++ b/source/adminguide/service_offerings.rst @@ -751,7 +751,7 @@ offering used for Virtual Routers. #. (Optional) Change global configuration You can change the default system offering for Virtual Routers of all accounts - by changing global configuration "router.service.offering" to uuid of the system offering. + by changing the global configuration "router.service.offering" to the uuid of the system offering. For more information, see `“Setting Global Configuration Parameters” <../installguide/configuration.html#setting-global-configuration-parameters>`_. From d4e52c398a0c9b0ce085f92b27e5bde2da06c76e Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Fri, 11 Feb 2022 15:49:17 +0100 Subject: [PATCH 09/23] Update source/adminguide/service_offerings.rst Co-authored-by: dahn --- source/adminguide/service_offerings.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/adminguide/service_offerings.rst b/source/adminguide/service_offerings.rst index 0a55d529c2..7deca8dbe6 100644 --- a/source/adminguide/service_offerings.rst +++ b/source/adminguide/service_offerings.rst @@ -767,7 +767,7 @@ new system offering set in Network Offering, account setting or global configura For more information, see `“Changing the Network Offering on a Guest Network” `_. -You can restart the network with cleanup. The new virtual routers will use the new system offering -set in Network Offering, account setting or global configuration. +You can restart the network with cleanup. The new virtual routers, created after the restart, will use +the new system offering, set in the NetworkOffering, account setting or global configuration. For more information, see `“Editing, Restarting, and Removing a Guest Network” `_. From e13c3b1c9e40242e504d97ebbf682c29f0f66dff Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Fri, 11 Feb 2022 15:49:23 +0100 Subject: [PATCH 10/23] Update source/adminguide/networking/manage_guest_networks.rst Co-authored-by: dahn --- source/adminguide/networking/manage_guest_networks.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/adminguide/networking/manage_guest_networks.rst b/source/adminguide/networking/manage_guest_networks.rst index 07ba58237b..5760ea8df9 100644 --- a/source/adminguide/networking/manage_guest_networks.rst +++ b/source/adminguide/networking/manage_guest_networks.rst @@ -17,7 +17,7 @@ Editing, Restarting, and Removing a Guest Network -------------------------------------------------- -.. note:: Ensure that all the vms are removed before you remove a guest network. +.. note:: Ensure that all the VMs are removed before you remove a guest network. #. Log in to the CloudStack UI as an administrator or end user. From 12000e67fcd1485d9c7265ad786ba3e8f1b77a14 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Fri, 11 Feb 2022 15:49:30 +0100 Subject: [PATCH 11/23] Update source/adminguide/networking/manage_guest_networks.rst Co-authored-by: dahn --- source/adminguide/networking/manage_guest_networks.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/adminguide/networking/manage_guest_networks.rst b/source/adminguide/networking/manage_guest_networks.rst index 5760ea8df9..595082b3dc 100644 --- a/source/adminguide/networking/manage_guest_networks.rst +++ b/source/adminguide/networking/manage_guest_networks.rst @@ -32,7 +32,7 @@ Editing, Restarting, and Removing a Guest Network #. In the Details tab, click the "Delete Network" button - You can remove the guest network by also using the remove button in the Quick + You can also remove the guest network by using the remove button in the Quick View. You can edit the name, description, network offering, CIDR, network domain of a From d6756b9257a1bdcdda8ee0a703646daafe8945b5 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Fri, 11 Feb 2022 15:49:36 +0100 Subject: [PATCH 12/23] Update source/adminguide/networking/manage_guest_networks.rst Co-authored-by: dahn --- source/adminguide/networking/manage_guest_networks.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/adminguide/networking/manage_guest_networks.rst b/source/adminguide/networking/manage_guest_networks.rst index 595082b3dc..3a4f162e36 100644 --- a/source/adminguide/networking/manage_guest_networks.rst +++ b/source/adminguide/networking/manage_guest_networks.rst @@ -25,7 +25,7 @@ Editing, Restarting, and Removing a Guest Network #. In the Select view, select Guest networks. - All the guest networks that you have created for the account is listed in the + All the guest networks that you have created for the account are listed in the page. #. Select the guest network you want to work with. From 81f0bc570402e18d45a594bb1ceaa4acd77a1a1a Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Fri, 11 Feb 2022 15:49:42 +0100 Subject: [PATCH 13/23] Update source/adminguide/service_offerings.rst Co-authored-by: dahn --- source/adminguide/service_offerings.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/adminguide/service_offerings.rst b/source/adminguide/service_offerings.rst index 7deca8dbe6..c0d1b27ab6 100644 --- a/source/adminguide/service_offerings.rst +++ b/source/adminguide/service_offerings.rst @@ -763,7 +763,7 @@ If global configuration is not set, the virtual routers will use the default sys routers ("System Offering For Software Router" or "System Offering For Software Router - Local Storage"). You can update an existing network to a new network offering. The new virtual routers will use the -new system offering set in Network Offering, account setting or global configuration. +new system offering set in the NetworkOffering, account setting or global configuration. For more information, see `“Changing the Network Offering on a Guest Network” `_. From be2d547a63219649b4114c89b0f1e63e71c01883 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Fri, 11 Feb 2022 15:49:54 +0100 Subject: [PATCH 14/23] Update source/adminguide/service_offerings.rst Co-authored-by: dahn --- source/adminguide/service_offerings.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/adminguide/service_offerings.rst b/source/adminguide/service_offerings.rst index c0d1b27ab6..7bcd31e663 100644 --- a/source/adminguide/service_offerings.rst +++ b/source/adminguide/service_offerings.rst @@ -756,7 +756,7 @@ offering used for Virtual Routers. For more information, see `“Setting Global Configuration Parameters” <../installguide/configuration.html#setting-global-configuration-parameters>`_. -When you create a network, the virtual routers will use the system offering in Network Offering. +When you create a network, the virtual routers will use the system offering in their NetworkOffering. If it is not set, the virtual routers will use system offering in account setting. If account setting is not set, the virtual routers will use system offering in global configuration. If global configuration is not set, the virtual routers will use the default system offering for virtual From 1eb5f7a5827b2605c9ddff6d52243d59d861db25 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Fri, 11 Feb 2022 15:50:02 +0100 Subject: [PATCH 15/23] Update source/adminguide/service_offerings.rst Co-authored-by: dahn --- source/adminguide/service_offerings.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/adminguide/service_offerings.rst b/source/adminguide/service_offerings.rst index 7bcd31e663..6a2502579d 100644 --- a/source/adminguide/service_offerings.rst +++ b/source/adminguide/service_offerings.rst @@ -757,7 +757,7 @@ offering used for Virtual Routers. <../installguide/configuration.html#setting-global-configuration-parameters>`_. When you create a network, the virtual routers will use the system offering in their NetworkOffering. -If it is not set, the virtual routers will use system offering in account setting. +If it is not set, the virtual routers will use the system offering in the account setting. If account setting is not set, the virtual routers will use system offering in global configuration. If global configuration is not set, the virtual routers will use the default system offering for virtual routers ("System Offering For Software Router" or "System Offering For Software Router - Local Storage"). From 3d1df4af59017055f0d349fa9e717d1dac06f4a7 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Fri, 11 Feb 2022 15:50:15 +0100 Subject: [PATCH 16/23] Update source/adminguide/service_offerings.rst Co-authored-by: dahn --- source/adminguide/service_offerings.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/adminguide/service_offerings.rst b/source/adminguide/service_offerings.rst index 6a2502579d..124bb0a754 100644 --- a/source/adminguide/service_offerings.rst +++ b/source/adminguide/service_offerings.rst @@ -758,7 +758,7 @@ offering used for Virtual Routers. When you create a network, the virtual routers will use the system offering in their NetworkOffering. If it is not set, the virtual routers will use the system offering in the account setting. -If account setting is not set, the virtual routers will use system offering in global configuration. +If the account setting is not set, the virtual routers will use the system offering set in the global configuration. If global configuration is not set, the virtual routers will use the default system offering for virtual routers ("System Offering For Software Router" or "System Offering For Software Router - Local Storage"). From 83252e090e324b9973380c9a7926f188205aa2dd Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Fri, 11 Feb 2022 15:50:27 +0100 Subject: [PATCH 17/23] Update source/adminguide/service_offerings.rst Co-authored-by: dahn --- source/adminguide/service_offerings.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/adminguide/service_offerings.rst b/source/adminguide/service_offerings.rst index 124bb0a754..4a3c3e2550 100644 --- a/source/adminguide/service_offerings.rst +++ b/source/adminguide/service_offerings.rst @@ -759,7 +759,7 @@ offering used for Virtual Routers. When you create a network, the virtual routers will use the system offering in their NetworkOffering. If it is not set, the virtual routers will use the system offering in the account setting. If the account setting is not set, the virtual routers will use the system offering set in the global configuration. -If global configuration is not set, the virtual routers will use the default system offering for virtual +If the global configuration is not set, the virtual routers will use the default system offering for virtual routers ("System Offering For Software Router" or "System Offering For Software Router - Local Storage"). You can update an existing network to a new network offering. The new virtual routers will use the From f86bef4e094564f834f1d4327b1bf8f41eeb4555 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Fri, 11 Feb 2022 15:50:45 +0100 Subject: [PATCH 18/23] Update source/adminguide/service_offerings.rst Co-authored-by: dahn --- source/adminguide/service_offerings.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/adminguide/service_offerings.rst b/source/adminguide/service_offerings.rst index 4a3c3e2550..db20a80944 100644 --- a/source/adminguide/service_offerings.rst +++ b/source/adminguide/service_offerings.rst @@ -734,7 +734,7 @@ offering used for Virtual Routers. For more information, see `“Creating a New System Offering” `_. -#. (Optional) Create a new network offering with System Offering +#. (Optional) Create a new network offering with SystemOffering For more information, see `“Creating a New Network Offering” `_. From f0def947e08a76c2b604b9360e032d39954523df Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Mon, 14 Feb 2022 08:15:53 +0100 Subject: [PATCH 19/23] Update source/adminguide/networking/manage_guest_networks.rst Co-authored-by: sureshanaparti <12028987+sureshanaparti@users.noreply.github.com> --- source/adminguide/networking/manage_guest_networks.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/adminguide/networking/manage_guest_networks.rst b/source/adminguide/networking/manage_guest_networks.rst index 3a4f162e36..b754622d09 100644 --- a/source/adminguide/networking/manage_guest_networks.rst +++ b/source/adminguide/networking/manage_guest_networks.rst @@ -39,6 +39,6 @@ Editing, Restarting, and Removing a Guest Network guest network. To do that, click the "Edit" button. To restart a guest network, click the "Restart network" button. Please note - all services provided by this network will be interrupted. When you check "Clean up", + all services provided by this network will be interrupted. When you enable "Clean up", the virtual routers of guest network will be destroyed and new virtual routers will be provisioned. From df747aed20fb20af5c6362583fa4bd1e86970753 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Mon, 14 Feb 2022 11:07:56 +0100 Subject: [PATCH 20/23] Update source/adminguide/service_offerings.rst Co-authored-by: sureshanaparti <12028987+sureshanaparti@users.noreply.github.com> --- source/adminguide/service_offerings.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/adminguide/service_offerings.rst b/source/adminguide/service_offerings.rst index db20a80944..d957dd75e1 100644 --- a/source/adminguide/service_offerings.rst +++ b/source/adminguide/service_offerings.rst @@ -729,7 +729,7 @@ Changing the Default System Offering for Virtual Routers As a CloudStack administrator, you can change the default system offering used for Virtual Routers. -#. Create a new system offering +#. Create a new system service offering For more information, see `“Creating a New System Offering” `_. From c8fe781571dbc683cdc5048b055a500eb615e6cf Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Mon, 14 Feb 2022 11:08:06 +0100 Subject: [PATCH 21/23] Update source/adminguide/service_offerings.rst Co-authored-by: sureshanaparti <12028987+sureshanaparti@users.noreply.github.com> --- source/adminguide/service_offerings.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/adminguide/service_offerings.rst b/source/adminguide/service_offerings.rst index d957dd75e1..aa2f0c4569 100644 --- a/source/adminguide/service_offerings.rst +++ b/source/adminguide/service_offerings.rst @@ -756,7 +756,7 @@ offering used for Virtual Routers. For more information, see `“Setting Global Configuration Parameters” <../installguide/configuration.html#setting-global-configuration-parameters>`_. -When you create a network, the virtual routers will use the system offering in their NetworkOffering. +When you create a network, the virtual routers will use the system offering in their Network Offering. If it is not set, the virtual routers will use the system offering in the account setting. If the account setting is not set, the virtual routers will use the system offering set in the global configuration. If the global configuration is not set, the virtual routers will use the default system offering for virtual From f03b01eeb3559837db8d551288e3219cb358caa0 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Mon, 14 Feb 2022 11:08:11 +0100 Subject: [PATCH 22/23] Update source/adminguide/service_offerings.rst Co-authored-by: sureshanaparti <12028987+sureshanaparti@users.noreply.github.com> --- source/adminguide/service_offerings.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/adminguide/service_offerings.rst b/source/adminguide/service_offerings.rst index aa2f0c4569..d5ae220d00 100644 --- a/source/adminguide/service_offerings.rst +++ b/source/adminguide/service_offerings.rst @@ -768,6 +768,6 @@ For more information, see `“Changing the Network Offering on a Guest Network `_. You can restart the network with cleanup. The new virtual routers, created after the restart, will use -the new system offering, set in the NetworkOffering, account setting or global configuration. +the new system offering, set in the Network Offering, account setting or global configuration. For more information, see `“Editing, Restarting, and Removing a Guest Network” `_. From b0caccc878d1ffeb21479ef4a5d3e988adc1e92c Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Mon, 14 Feb 2022 11:08:16 +0100 Subject: [PATCH 23/23] Update source/adminguide/service_offerings.rst Co-authored-by: sureshanaparti <12028987+sureshanaparti@users.noreply.github.com> --- source/adminguide/service_offerings.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/adminguide/service_offerings.rst b/source/adminguide/service_offerings.rst index d5ae220d00..1a85afec4c 100644 --- a/source/adminguide/service_offerings.rst +++ b/source/adminguide/service_offerings.rst @@ -763,7 +763,7 @@ If the global configuration is not set, the virtual routers will use the default routers ("System Offering For Software Router" or "System Offering For Software Router - Local Storage"). You can update an existing network to a new network offering. The new virtual routers will use the -new system offering set in the NetworkOffering, account setting or global configuration. +new system offering set in the Network Offering, account setting or global configuration. For more information, see `“Changing the Network Offering on a Guest Network” `_.