From 08256e97248524c8a2d23f3a32a46fc3a9b310bd Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Fri, 26 Sep 2025 10:34:39 +0200 Subject: [PATCH 1/4] Extensions: use home directory of cloud user instead of /var/lib/cloudstack/management/ --- .../external/provisioner/ExternalPathPayloadProvisioner.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/hypervisors/external/src/main/java/org/apache/cloudstack/hypervisor/external/provisioner/ExternalPathPayloadProvisioner.java b/plugins/hypervisors/external/src/main/java/org/apache/cloudstack/hypervisor/external/provisioner/ExternalPathPayloadProvisioner.java index 5a1632ce9777..dc1e59ada17e 100644 --- a/plugins/hypervisors/external/src/main/java/org/apache/cloudstack/hypervisor/external/provisioner/ExternalPathPayloadProvisioner.java +++ b/plugins/hypervisors/external/src/main/java/org/apache/cloudstack/hypervisor/external/provisioner/ExternalPathPayloadProvisioner.java @@ -104,7 +104,7 @@ public class ExternalPathPayloadProvisioner extends ManagerBase implements Exter private static final String PROPERTIES_FILE = "server.properties"; private static final String EXTENSIONS_DEPLOYMENT_MODE_NAME = "extensions.deployment.mode"; private static final String EXTENSIONS_DIRECTORY_PROD = "/usr/share/cloudstack-management/extensions"; - private static final String EXTENSIONS_DATA_DIRECTORY_PROD = "/var/lib/cloudstack/management/extensions"; + private static final String EXTENSIONS_DATA_DIRECTORY_PROD = System.getProperty("user.home") + "/extensions"; private static final String EXTENSIONS_DIRECTORY_DEV = "extensions"; private static final String EXTENSIONS_DATA_DIRECTORY_DEV = "client/target/extensions-data"; From 2417c964ecb192015432448480210ff77cac71e0 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Tue, 30 Sep 2025 09:07:22 +0200 Subject: [PATCH 2/4] Update plugins/hypervisors/external/src/main/java/org/apache/cloudstack/hypervisor/external/provisioner/ExternalPathPayloadProvisioner.java Co-authored-by: dahn --- .../external/provisioner/ExternalPathPayloadProvisioner.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/hypervisors/external/src/main/java/org/apache/cloudstack/hypervisor/external/provisioner/ExternalPathPayloadProvisioner.java b/plugins/hypervisors/external/src/main/java/org/apache/cloudstack/hypervisor/external/provisioner/ExternalPathPayloadProvisioner.java index dc1e59ada17e..f83dd5daf9df 100644 --- a/plugins/hypervisors/external/src/main/java/org/apache/cloudstack/hypervisor/external/provisioner/ExternalPathPayloadProvisioner.java +++ b/plugins/hypervisors/external/src/main/java/org/apache/cloudstack/hypervisor/external/provisioner/ExternalPathPayloadProvisioner.java @@ -104,8 +104,9 @@ public class ExternalPathPayloadProvisioner extends ManagerBase implements Exter private static final String PROPERTIES_FILE = "server.properties"; private static final String EXTENSIONS_DEPLOYMENT_MODE_NAME = "extensions.deployment.mode"; private static final String EXTENSIONS_DIRECTORY_PROD = "/usr/share/cloudstack-management/extensions"; - private static final String EXTENSIONS_DATA_DIRECTORY_PROD = System.getProperty("user.home") + "/extensions"; - private static final String EXTENSIONS_DIRECTORY_DEV = "extensions"; + private static final String EXTENSIONS_DIRECTORY = "extensions"; + private static final String EXTENSIONS_DATA_DIRECTORY_PROD = System.getProperty("user.home") + EXTENSIONS_DIRECTORY; + private static final String EXTENSIONS_DIRECTORY_DEV = EXTENSIONS_DIRECTORY; private static final String EXTENSIONS_DATA_DIRECTORY_DEV = "client/target/extensions-data"; @Inject From 48c0c0df2a411d13750803e5a1704a00b800452a Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Tue, 30 Sep 2025 09:08:19 +0200 Subject: [PATCH 3/4] Revert "Update plugins/hypervisors/external/src/main/java/org/apache/cloudstack/hypervisor/external/provisioner/ExternalPathPayloadProvisioner.java" This reverts commit 2417c964ecb192015432448480210ff77cac71e0. --- .../external/provisioner/ExternalPathPayloadProvisioner.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/plugins/hypervisors/external/src/main/java/org/apache/cloudstack/hypervisor/external/provisioner/ExternalPathPayloadProvisioner.java b/plugins/hypervisors/external/src/main/java/org/apache/cloudstack/hypervisor/external/provisioner/ExternalPathPayloadProvisioner.java index f83dd5daf9df..dc1e59ada17e 100644 --- a/plugins/hypervisors/external/src/main/java/org/apache/cloudstack/hypervisor/external/provisioner/ExternalPathPayloadProvisioner.java +++ b/plugins/hypervisors/external/src/main/java/org/apache/cloudstack/hypervisor/external/provisioner/ExternalPathPayloadProvisioner.java @@ -104,9 +104,8 @@ public class ExternalPathPayloadProvisioner extends ManagerBase implements Exter private static final String PROPERTIES_FILE = "server.properties"; private static final String EXTENSIONS_DEPLOYMENT_MODE_NAME = "extensions.deployment.mode"; private static final String EXTENSIONS_DIRECTORY_PROD = "/usr/share/cloudstack-management/extensions"; - private static final String EXTENSIONS_DIRECTORY = "extensions"; - private static final String EXTENSIONS_DATA_DIRECTORY_PROD = System.getProperty("user.home") + EXTENSIONS_DIRECTORY; - private static final String EXTENSIONS_DIRECTORY_DEV = EXTENSIONS_DIRECTORY; + private static final String EXTENSIONS_DATA_DIRECTORY_PROD = System.getProperty("user.home") + "/extensions"; + private static final String EXTENSIONS_DIRECTORY_DEV = "extensions"; private static final String EXTENSIONS_DATA_DIRECTORY_DEV = "client/target/extensions-data"; @Inject From c2a7201b27e9b8fd5b8dedcd92c46974e48c8393 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Tue, 30 Sep 2025 09:10:44 +0200 Subject: [PATCH 4/4] Update ExternalPathPayloadProvisioner.java --- .../external/provisioner/ExternalPathPayloadProvisioner.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/hypervisors/external/src/main/java/org/apache/cloudstack/hypervisor/external/provisioner/ExternalPathPayloadProvisioner.java b/plugins/hypervisors/external/src/main/java/org/apache/cloudstack/hypervisor/external/provisioner/ExternalPathPayloadProvisioner.java index dc1e59ada17e..0d25498973ea 100644 --- a/plugins/hypervisors/external/src/main/java/org/apache/cloudstack/hypervisor/external/provisioner/ExternalPathPayloadProvisioner.java +++ b/plugins/hypervisors/external/src/main/java/org/apache/cloudstack/hypervisor/external/provisioner/ExternalPathPayloadProvisioner.java @@ -102,10 +102,11 @@ public class ExternalPathPayloadProvisioner extends ManagerBase implements Exter BASE_EXTERNAL_PROVISIONER_SCRIPTS_DIR + "/provisioner.sh"; private static final String PROPERTIES_FILE = "server.properties"; + private static final String EXTENSIONS = "extensions"; private static final String EXTENSIONS_DEPLOYMENT_MODE_NAME = "extensions.deployment.mode"; private static final String EXTENSIONS_DIRECTORY_PROD = "/usr/share/cloudstack-management/extensions"; - private static final String EXTENSIONS_DATA_DIRECTORY_PROD = System.getProperty("user.home") + "/extensions"; - private static final String EXTENSIONS_DIRECTORY_DEV = "extensions"; + private static final String EXTENSIONS_DATA_DIRECTORY_PROD = System.getProperty("user.home") + File.separator + EXTENSIONS; + private static final String EXTENSIONS_DIRECTORY_DEV = EXTENSIONS; private static final String EXTENSIONS_DATA_DIRECTORY_DEV = "client/target/extensions-data"; @Inject