(cloudstack) branch 4.20 updated: engine/schema: create default network offering for vpc tier with conserve_mode=1 for fresh installation (#10744)

[pearl11594]

This is an automated email from the ASF dual-hosted git repository.

pearl11594 pushed a commit to branch 4.20
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/4.20 by this push:
     new 7e2aa0efe42 engine/schema: create default network offering for vpc 
tier with conserve_mode=1 for fresh installation (#10744)
7e2aa0efe42 is described below

commit 7e2aa0efe427804d561581c78b07c58b12a531db
Author: Wei Zhou <weiz...@apache.org>
AuthorDate: Fri May 9 10:21:43 2025 +0200

    engine/schema: create default network offering for vpc tier with 
conserve_mode=1 for fresh installation (#10744)
---
 .../apache/cloudstack/engine/orchestration/NetworkOrchestrator.java    | 2 +-
 engine/schema/src/main/resources/META-INF/db/schema-42000to42010.sql   | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git 
a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
 
b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
index 22ec005a8d1..d6f98e00a53 100644
--- 
a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
+++ 
b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
@@ -595,7 +595,7 @@ public class NetworkOrchestrator extends ManagerBase 
implements NetworkOrchestra
                 if 
(_networkOfferingDao.findByUniqueName(NetworkOffering.DefaultIsolatedNetworkOfferingForVpcNetworks)
 == null) {
                     offering = 
_configMgr.createNetworkOffering(NetworkOffering.DefaultIsolatedNetworkOfferingForVpcNetworks,
                             "Offering for Isolated VPC networks with Source 
Nat service enabled", TrafficType.Guest, null, false, Availability.Optional, 
null,
-                            defaultVPCOffProviders, true, 
Network.GuestType.Isolated, false, null, false, null, false, false, null, 
false, null, true, true, false, false, null, null, null,true, null, null, 
false);
+                            defaultVPCOffProviders, true, 
Network.GuestType.Isolated, false, null, true, null, false, false, null, false, 
null, true, true, false, false, null, null, null,true, null, null, false);
                 }
 
                 //#6 - default vpc offering with no LB service
diff --git 
a/engine/schema/src/main/resources/META-INF/db/schema-42000to42010.sql 
b/engine/schema/src/main/resources/META-INF/db/schema-42000to42010.sql
index e60378a2dc8..b8c44c40c46 100644
--- a/engine/schema/src/main/resources/META-INF/db/schema-42000to42010.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-42000to42010.sql
@@ -75,3 +75,6 @@ CALL `cloud`.`IDEMPOTENT_UPDATE_API_PERMISSION`('Read-Only 
Admin - Default', 'va
 
 CALL `cloud`.`IDEMPOTENT_UPDATE_API_PERMISSION`('Support Admin - Default', 
'setupUserTwoFactorAuthentication', 'ALLOW');
 CALL `cloud`.`IDEMPOTENT_UPDATE_API_PERMISSION`('Support Admin - Default', 
'validateUserTwoFactorAuthenticationCode', 'ALLOW');
+
+-- Re-apply VPC: update default network offering for vpc tier to 
conserve_mode=1 (#8309)
+UPDATE `cloud`.`network_offerings` SET conserve_mode=1 WHERE 
name='DefaultIsolatedNetworkOfferingForVpcNetworks';