You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ed...@apache.org on 2013/02/14 02:11:26 UTC
[21/50] [abbrv] git commit: refs/heads/storage_refactor - Summary:
Fix hanging references to /var/lib/cloud, changed to /var/cloudstack
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 <ma...@betterservers.com> 1360786749 -0700
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/8652e5f8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/8652e5f8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/8652e5f8
Branch: refs/heads/storage_refactor
Commit: 8652e5f87e49e44eeddb14454984569f4f3439e1
Parents: 4e7da00
Author: Marcus Sorensen <ma...@betterservers.com>
Authored: Wed Feb 13 13:19:09 2013 -0700
Committer: Marcus Sorensen <ma...@betterservers.com>
Committed: Wed Feb 13 13:22:28 2013 -0700
----------------------------------------------------------------------
packaging/centos63/cloud.spec | 2 +-
python/lib/cloudutils/serviceConfigServer.py | 2 +-
server/src/com/cloud/configuration/Config.java | 2 +-
setup/db/server-setup.xml | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8652e5f8/packaging/centos63/cloud.spec
----------------------------------------------------------------------
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index 82de954..5a15ce4 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -284,7 +284,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
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8652e5f8/packaging/centos63/package.sh
----------------------------------------------------------------------
diff --git a/packaging/centos63/package.sh b/packaging/centos63/package.sh
old mode 100644
new mode 100755
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8652e5f8/python/lib/cloudutils/serviceConfigServer.py
----------------------------------------------------------------------
diff --git a/python/lib/cloudutils/serviceConfigServer.py b/python/lib/cloudutils/serviceConfigServer.py
index 66ec2d0..a08ce02 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)
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8652e5f8/server/src/com/cloud/configuration/Config.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/configuration/Config.java b/server/src/com/cloud/configuration/Config.java
index 26499bc..b22bf4b 100755
--- a/server/src/com/cloud/configuration/Config.java
+++ b/server/src/com/cloud/configuration/Config.java
@@ -180,7 +180,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),
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8652e5f8/setup/db/server-setup.xml
----------------------------------------------------------------------
diff --git a/setup/db/server-setup.xml b/setup/db/server-setup.xml
index 912dd0b..bb8878f 100755
--- a/setup/db/server-setup.xml
+++ b/setup/db/server-setup.xml
@@ -446,7 +446,7 @@ under the License.
<!--
<configuration>
<name>mount.parent</name>
- <value>/var/lib/cloud/mnt</value>
+ <value>/var/cloudstack/mnt</value>
</configuration>
-->
</configurationEntries>