Skip to content

Commit 4543df7

Browse files
committed
server: fix conserve_mode of DefaultIsolatedNetworkOfferingForVpcNetworks
1 parent be22bfe commit 4543df7

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,3 +203,6 @@ SET `sort_key` = CASE
203203
ELSE `sort_key`
204204
END;
205205
-- End: Changes for Guest OS category cleanup
206+
207+
-- Re-apply VPC: update default network offering for vpc tier to conserve_mode=1 (#8309)
208+
UPDATE `cloud`.`network_offerings` SET conserve_mode=1 WHERE name='DefaultIsolatedNetworkOfferingForVpcNetworks';

server/src/main/java/com/cloud/server/ConfigurationServerImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1121,7 +1121,7 @@ public void doInTransactionWithoutResult(TransactionStatus status) {
11211121
NetworkOfferingVO defaultNetworkOfferingForVpcNetworks =
11221122
new NetworkOfferingVO(NetworkOffering.DefaultIsolatedNetworkOfferingForVpcNetworks,
11231123
"Offering for Isolated Vpc networks with Source Nat service enabled", TrafficType.Guest, false, false, null, null, true, Availability.Optional,
1124-
null, Network.GuestType.Isolated, false, false, false, false, true, true);
1124+
null, Network.GuestType.Isolated, true, false, false, false, true, true);
11251125

11261126
defaultNetworkOfferingForVpcNetworks.setState(NetworkOffering.State.Enabled);
11271127
defaultNetworkOfferingForVpcNetworks.setSupportsVmAutoScaling(true);

0 commit comments

Comments
 (0)