From d4d73bfc3ff86966db38f3ce8015d5734629b8a9 Mon Sep 17 00:00:00 2001 From: Marcus Sorensen Date: Wed, 13 Feb 2013 13:19:09 -0700 Subject: [PATCH] Summary: Fix hanging references to /var/lib/cloud, changed to /var/cloudstack BUG-ID: CLOUDSTACK-1201 BUG-ID: CLOUDSTACK-1196 Signed-off-by: Marcus Sorensen 1360786749 -0700 --- packaging/centos63/cloud.spec | 2 +- packaging/centos63/package.sh | 0 python/lib/cloudutils/serviceConfigServer.py | 2 +- server/src/com/cloud/configuration/Config.java | 2 +- setup/db/server-setup.xml | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) mode change 100644 => 100755 packaging/centos63/package.sh diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec index 244f0c7b00b..960f91ffe46 100644 --- a/packaging/centos63/cloud.spec +++ b/packaging/centos63/cloud.spec @@ -283,7 +283,7 @@ fi %pre management id cloud > /dev/null 2>&1 || /usr/sbin/useradd -M -c "CloudStack unprivileged user" \ - -r -s /bin/sh -d %{_localstatedir}/cloud/management cloud|| true + -r -s /bin/sh -d %{_localstatedir}/cloudstack/management cloud|| true # set max file descriptors for cloud user to 4096 sed -i /"cloud hard nofile"/d /etc/security/limits.conf diff --git a/packaging/centos63/package.sh b/packaging/centos63/package.sh old mode 100644 new mode 100755 diff --git a/python/lib/cloudutils/serviceConfigServer.py b/python/lib/cloudutils/serviceConfigServer.py index 66ec2d00a92..a08ce02d766 100644 --- a/python/lib/cloudutils/serviceConfigServer.py +++ b/python/lib/cloudutils/serviceConfigServer.py @@ -73,7 +73,7 @@ class cloudManagementConfig(serviceCfgBase): bash("iptables -A PREROUTING -t nat -p tcp --dport 443 -j REDIRECT --to-port 8250 ") #generate keystore - keyPath = "/var/lib/cloud/management/web.keystore" + keyPath = "/var/cloudstack/management/web.keystore" if not os.path.exists(keyPath): cmd = bash("keytool -genkey -keystore %s -storepass \"cloud.com\" -keypass \"cloud.com\" -validity 3650 -dname cn=\"Cloudstack User\",ou=\"mycloud.cloud.com\",o=\"mycloud.cloud.com\",c=\"Unknown\""%keyPath) diff --git a/server/src/com/cloud/configuration/Config.java b/server/src/com/cloud/configuration/Config.java index cbd5b013699..fea76b41926 100755 --- a/server/src/com/cloud/configuration/Config.java +++ b/server/src/com/cloud/configuration/Config.java @@ -179,7 +179,7 @@ public enum Config { MigrateWait("Advanced", AgentManager.class, Integer.class, "migratewait", "3600", "Time (in seconds) to wait for VM migrate finish", null), Workers("Advanced", AgentManager.class, Integer.class, "workers", "5", "Number of worker threads.", null), HAWorkers("Advanced", AgentManager.class, Integer.class, "ha.workers", "5", "Number of ha worker threads.", null), - MountParent("Advanced", ManagementServer.class, String.class, "mount.parent", "/var/lib/cloud/management/mnt", "The mount point on the Management Server for Secondary Storage.", null), + MountParent("Advanced", ManagementServer.class, String.class, "mount.parent", "/var/cloudstack/mnt", "The mount point on the Management Server for Secondary Storage.", null), // UpgradeURL("Advanced", ManagementServer.class, String.class, "upgrade.url", "http://example.com:8080/client/agent/update.zip", "The upgrade URL is the URL of the management server that agents will connect to in order to automatically upgrade.", null), SystemVMUseLocalStorage("Advanced", ManagementServer.class, Boolean.class, "system.vm.use.local.storage", "false", "Indicates whether to use local storage pools or shared storage pools for system VMs.", null), SystemVMAutoReserveCapacity("Advanced", ManagementServer.class, Boolean.class, "system.vm.auto.reserve.capacity", "true", "Indicates whether or not to automatically reserver system VM standby capacity.", null), diff --git a/setup/db/server-setup.xml b/setup/db/server-setup.xml index 912dd0b85d8..bb8878f8d37 100755 --- a/setup/db/server-setup.xml +++ b/setup/db/server-setup.xml @@ -446,7 +446,7 @@ under the License.