From 96f614e975705da428b73882ab434a32837c87e4 Mon Sep 17 00:00:00 2001
From: Abhisar Sinha <63767682+abh1sar@users.noreply.github.com>
Date: Tue, 3 Dec 2024 12:05:47 +0530
Subject: [PATCH 1/3] vpc-name prepend to tier-name using global settings
 (#445)

---
 source/adminguide/networking/virtual_private_cloud_config.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/source/adminguide/networking/virtual_private_cloud_config.rst b/source/adminguide/networking/virtual_private_cloud_config.rst
index 79599d0686..0365e98c60 100644
--- a/source/adminguide/networking/virtual_private_cloud_config.rst
+++ b/source/adminguide/networking/virtual_private_cloud_config.rst
@@ -266,6 +266,10 @@ other Network Tiers within the VPC.
 
    -  **Name**: A unique name for the Network Tier you create.
 
+   .. note::
+      Admins can choose to automatically prepend the VPC name to the Tier name during creation
+      using global configurations "vpc.tier.name.prepend" and "vpc.tier.name.prepend.delimiter".
+
    -  **Network Offering**: The following default Network offerings are
       listed: Internal LB,
       DefaultIsolatedNetworkOfferingForVpcNetworksNoLB,

From 3c4c903c9376f69e5b2e6768792e7acc2a50a9a0 Mon Sep 17 00:00:00 2001
From: Davide <48259205+Dav-11@users.noreply.github.com>
Date: Wed, 18 Dec 2024 13:07:23 +0100
Subject: [PATCH 2/3] Added command to set libvirtd to traditional mode

---
 source/installguide/hypervisor/kvm.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/source/installguide/hypervisor/kvm.rst b/source/installguide/hypervisor/kvm.rst
index 72bf766185..41205acf86 100644
--- a/source/installguide/hypervisor/kvm.rst
+++ b/source/installguide/hypervisor/kvm.rst
@@ -478,6 +478,12 @@ cloudstack-agent and should already be installed.
    .. parsed-literal::
       remote_mode="legacy"
 
+   Set libvirtd mode to traditional mode (see https://libvirt.org/manpages/libvirtd.html#system-socket-activation):
+   
+   .. parsed-literal::
+      systemctl mask libvirtd.socket libvirtd-ro.socket \
+         libvirtd-admin.socket libvirtd-tls.socket libvirtd-tcp.socket
+
 
 #. Restart libvirt
 

From fcc5ccedb0b8d1827d0d83462809f896e8be2fba Mon Sep 17 00:00:00 2001
From: Davide <48259205+Dav-11@users.noreply.github.com>
Date: Wed, 18 Dec 2024 15:23:23 +0100
Subject: [PATCH 3/3] removed newline

---
 source/installguide/hypervisor/kvm.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/source/installguide/hypervisor/kvm.rst b/source/installguide/hypervisor/kvm.rst
index 41205acf86..6f4e6452a4 100644
--- a/source/installguide/hypervisor/kvm.rst
+++ b/source/installguide/hypervisor/kvm.rst
@@ -478,11 +478,11 @@ cloudstack-agent and should already be installed.
    .. parsed-literal::
       remote_mode="legacy"
 
-   Set libvirtd mode to traditional mode (see https://libvirt.org/manpages/libvirtd.html#system-socket-activation):
-   
+   On Ubuntu 24.04 or newer set libvirtd mode to traditional mode (see https://libvirt.org/manpages/libvirtd.html#system-socket-activation):
+
    .. parsed-literal::
-      systemctl mask libvirtd.socket libvirtd-ro.socket \
-         libvirtd-admin.socket libvirtd-tls.socket libvirtd-tcp.socket
+
+      systemctl mask libvirtd.socket libvirtd-ro.socket libvirtd-admin.socket libvirtd-tls.socket libvirtd-tcp.socket
 
 
 #. Restart libvirt