cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject [10/44] git commit: refs/heads/marvin-refactor - debian: Packaging update for mainly the Agent
Date Mon, 04 Mar 2013 13:43:01 GMT
debian: Packaging update for mainly the Agent

The new cloudstack-agent package wouldn't boot due to various issues.

Those all seem to be resolved.

Other changes include path changes like /etc/cloud -> /etc/cloudstack

The new package now installs, but the upgrade hasn't been tested yet.


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/20070ee0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/20070ee0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/20070ee0

Branch: refs/heads/marvin-refactor
Commit: 20070ee07f1718e1eee0f7256e3f1004116cfee8
Parents: 6223520
Author: Wido den Hollander <wido@widodh.nl>
Authored: Fri Mar 1 12:09:16 2013 +0100
Committer: Wido den Hollander <wido@widodh.nl>
Committed: Fri Mar 1 15:06:07 2013 +0100

----------------------------------------------------------------------
 debian/cloudstack-agent.install      |   10 ++--
 debian/cloudstack-common.install     |    2 -
 debian/cloudstack-management.install |    6 +-
 debian/cloudstack-usage.install      |    4 +-
 debian/control                       |    2 +-
 debian/rules                         |  104 +++++++++++++++--------------
 packaging/debian/init/cloud-agent    |    8 ++-
 packaging/debian/init/cloud-usage    |    2 +-
 packaging/debian/replace.properties  |   26 ++++----
 9 files changed, 83 insertions(+), 81 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/20070ee0/debian/cloudstack-agent.install
----------------------------------------------------------------------
diff --git a/debian/cloudstack-agent.install b/debian/cloudstack-agent.install
index 84eee10..cf57bfe 100644
--- a/debian/cloudstack-agent.install
+++ b/debian/cloudstack-agent.install
@@ -15,11 +15,11 @@
 # specific language governing permissions and limitations
 # under the License.
 
-/etc/cloud/agent/agent.properties
-/etc/cloud/agent/environment.properties
-/etc/cloud/agent/log4j-cloud.xml
-/etc/init.d/cloud-agent
+/etc/cloudstack/agent/agent.properties
+/etc/cloudstack/agent/environment.properties
+/etc/cloudstack/agent/log4j-cloud.xml
+/etc/init.d/cloudstack-agent
 /usr/bin/cloud-setup-agent
 /usr/bin/cloud-ssh
 /var/log/cloudstack/agent
-/usr/share/cloudstack-agent/lib/cloudstack-agent-kvm.jar
+/usr/share/cloudstack-agent/lib/*

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/20070ee0/debian/cloudstack-common.install
----------------------------------------------------------------------
diff --git a/debian/cloudstack-common.install b/debian/cloudstack-common.install
index de97ee9..9677f87 100644
--- a/debian/cloudstack-common.install
+++ b/debian/cloudstack-common.install
@@ -15,8 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-/usr/share/cloudstack-common/lib/cloudstack-core.jar
-/usr/share/cloudstack-common/lib/cloudstack-api.jar
 /usr/share/cloudstack-common/vms/systemvm.iso
 /usr/share/cloudstack-common/scripts/installer/*
 /usr/share/cloudstack-common/scripts/network/*

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/20070ee0/debian/cloudstack-management.install
----------------------------------------------------------------------
diff --git a/debian/cloudstack-management.install b/debian/cloudstack-management.install
index e87b444..f689862 100644
--- a/debian/cloudstack-management.install
+++ b/debian/cloudstack-management.install
@@ -15,9 +15,9 @@
 # specific language governing permissions and limitations
 # under the License.
 
-/etc/cloud/server/*
-/etc/cloud/management/*
-/etc/init.d/cloud-management
+/etc/cloudstack/server/*
+/etc/cloudstack/management/*
+/etc/init.d/cloudstack-management
 /var/cache/cloudstack/management
 /var/cache/cloudstack/management/work
 /var/cache/cloudstack/management/temp

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/20070ee0/debian/cloudstack-usage.install
----------------------------------------------------------------------
diff --git a/debian/cloudstack-usage.install b/debian/cloudstack-usage.install
index 2696c20..53f2a56 100644
--- a/debian/cloudstack-usage.install
+++ b/debian/cloudstack-usage.install
@@ -16,6 +16,6 @@
 # under the License.
 
 /usr/share/cloudstack-usage/lib/cloudstack-usage.jar
-/etc/init.d/cloud-usage
+/etc/init.d/cloudstack-usage
 /var/log/cloudstack/usage
-/etc/cloud/usage/*
+/etc/cloudstack/usage/*

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/20070ee0/debian/control
----------------------------------------------------------------------
diff --git a/debian/control b/debian/control
index 98a390f..c8abc22 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ Description: CloudStack server library
 
 Package: cloudstack-agent
 Architecture: all
-Depends: openjdk-6-jre | openjdk-7-jre, cloudstack-common (= ${source:Version}), lsb-base
(>= 3.2), openssh-client, libvirt0, sysvinit-utils, chkconfig, qemu-kvm, libvirt-bin, uuid-runtime,
rsync, grep, iproute, ebtables, vlan, wget, jsvc
+Depends: openjdk-6-jre | openjdk-7-jre, cloudstack-common (= ${source:Version}), lsb-base
(>= 3.2), libcommons-daemon-java, openssh-client, libvirt0, sysvinit-utils, chkconfig,
qemu-kvm, libvirt-bin, uuid-runtime, rsync, grep, iproute, ebtables, vlan, wget, jsvc
 Conflicts: cloud-agent, cloud-agent-libs, cloud-agent-deps, cloud-agent-scripts
 Description: CloudStack agent
  The CloudStack agent is in charge of managing shared computing resources in

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/20070ee0/debian/rules
----------------------------------------------------------------------
diff --git a/debian/rules b/debian/rules
index d4002f3..ba9056e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,6 +12,8 @@
 
 DEBVERS := $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p')
 VERSION := $(shell echo '$(DEBVERS)' | sed -e 's/^[[:digit:]]*://' -e 's/[~-].*//')
+PACKAGE = $(shell dh_listpackages|head -n 1|cut -d '-' -f 1)
+SYSCONFDIR = "/etc"
 
 # Uncomment this to turn on verbose mode.
 export DH_VERBOSE=1
@@ -48,85 +50,85 @@ install:
 	dh_prep -s
 
 	# Common packages
-	mkdir -p debian/tmp/etc/cloud
-	mkdir -p debian/tmp/etc/init.d
-	mkdir -p debian/tmp/var/cache/cloudstack
-	mkdir -p debian/tmp/var/log/cloudstack
+	mkdir -p debian/tmp$(SYSCONFDIR)/$(PACKAGE)
+	mkdir -p debian/tmp$(SYSCONFDIR)/init.d
+	mkdir -p debian/tmp/var/cache/$(PACKAGE)
+	mkdir -p debian/tmp/var/log/$(PACKAGE)
 	mkdir -p debian/tmp/var/lib/cloud
 	mkdir -p debian/tmp/usr/bin
 	mkdir -p debian/tmp/usr/share/cloud
 	mkdir -p debian/tmp/usr/lib/cloud
 
 	# cloudstack-agent
-	mkdir debian/tmp/etc/cloud/agent
-	mkdir debian/tmp/var/log/cloudstack/agent
-	install -D plugins/hypervisors/kvm/target/cloud-plugin-hypervisor-kvm-4.2.0-SNAPSHOT.jar
debian/tmp/usr/share/cloudstack-agent/lib/cloudstack-agent-kvm.jar
-	install -D packaging/debian/init/cloud-agent debian/tmp/etc/init.d/
+	mkdir debian/tmp$(SYSCONFDIR)/$(PACKAGE)/agent
+	mkdir debian/tmp/var/log/$(PACKAGE)/agent
+	install -D agent/target/cloud-agent-4.2.0-SNAPSHOT.jar debian/tmp/usr/share/$(PACKAGE)-agent/lib/$(PACKAGE)-agent.jar
+	install -D plugins/hypervisors/kvm/target/cloud-plugin-hypervisor-kvm-4.2.0-SNAPSHOT.jar
debian/tmp/usr/share/$(PACKAGE)-agent/lib/
+	install -D plugins/hypervisors/kvm/target/dependencies/* debian/tmp/usr/share/$(PACKAGE)-agent/lib/
+	install -D packaging/debian/init/cloud-agent debian/tmp$(SYSCONFDIR)/init.d/$(PACKAGE)-agent
 	install -D agent/bindir/cloud-setup-agent.in debian/tmp/usr/bin/cloud-setup-agent
 	install -D agent/bindir/cloud-ssh.in debian/tmp/usr/bin/cloud-ssh
-	cp agent/target/transformed/* debian/tmp/etc/cloud/agent
+	install -D agent/target/transformed/* debian/tmp$(SYSCONFDIR)/$(PACKAGE)/agent
 
 	# cloudstack-management
-	mkdir debian/tmp/etc/cloud/server
-	mkdir debian/tmp/etc/cloud/management
-	mkdir -p debian/tmp/usr/share/cloudstack-management
-	mkdir -p debian/tmp/usr/share/cloudstack-management/webapps/client
-	mkdir debian/tmp/usr/share/cloudstack-management/setup
-	mkdir debian/tmp/var/log/cloudstack/management
-	mkdir debian/tmp/var/cache/cloudstack/management
-	mkdir debian/tmp/var/cache/cloudstack/management/work
-	mkdir debian/tmp/var/cache/cloudstack/management/temp
-	mkdir debian/tmp/var/log/cloudstack/ipallocator
+	mkdir debian/tmp$(SYSCONFDIR)/$(PACKAGE)/server
+	mkdir debian/tmp$(SYSCONFDIR)/$(PACKAGE)/management
+	mkdir -p debian/tmp/usr/share/$(PACKAGE)-management
+	mkdir -p debian/tmp/usr/share/$(PACKAGE)-management/webapps/client
+	mkdir debian/tmp/usr/share/$(PACKAGE)-management/setup
+	mkdir debian/tmp/var/log/$(PACKAGE)/management
+	mkdir debian/tmp/var/cache/$(PACKAGE)/management
+	mkdir debian/tmp/var/cache/$(PACKAGE)/management/work
+	mkdir debian/tmp/var/cache/$(PACKAGE)/management/temp
+	mkdir debian/tmp/var/log/$(PACKAGE)/ipallocator
 	mkdir debian/tmp/var/lib/cloud/management
 	mkdir debian/tmp/var/lib/cloud/mnt
-	cp -r client/target/utilities/scripts/db/* debian/tmp/usr/share/cloudstack-management/setup/
-	cp -r client/target/cloud-client-ui-4.2.0-SNAPSHOT/* debian/tmp/usr/share/cloudstack-management/webapps/client/
-	cp server/target/conf/* debian/tmp/etc/cloud/server/
-	cp client/target/conf/* debian/tmp/etc/cloud/management/
-	ln -s tomcat6-nonssl.conf debian/tmp/etc/cloud/management/tomcat6.conf
-	mkdir -p debian/tmp/etc/cloud/management/Catalina/localhost/client
-	install -D packaging/debian/init/cloud-management debian/tmp/etc/init.d/cloud-management
+	cp -r client/target/utilities/scripts/db/* debian/tmp/usr/share/$(PACKAGE)-management/setup/
+	cp -r client/target/cloud-client-ui-4.2.0-SNAPSHOT/* debian/tmp/usr/share/$(PACKAGE)-management/webapps/client/
+	cp server/target/conf/* debian/tmp$(SYSCONFDIR)/$(PACKAGE)/server/
+	cp client/target/conf/* debian/tmp$(SYSCONFDIR)/$(PACKAGE)/management/
+	ln -s tomcat6-nonssl.conf debian/tmp$(SYSCONFDIR)/$(PACKAGE)/management/tomcat6.conf
+	mkdir -p debian/tmp$(SYSCONFDIR)/$(PACKAGE)/management/Catalina/localhost/client
+	install -D packaging/debian/init/cloud-management debian/tmp$(SYSCONFDIR)/init.d/$(PACKAGE)-management
 	install -D client/bindir/cloud-update-xenserver-licenses.in debian/tmp/usr/bin/cloud-update-xenserver-licenses
-	install -D server/target/cloud-server-4.2.0-SNAPSHOT.jar debian/tmp/usr/share/cloudstack-management/lib/cloudstack-server.jar
-	ln -s /usr/share/tomcat6/bin debian/tmp/usr/share/cloudstack-management/bin
-	ln -s ../../../etc/cloud/management debian/tmp/usr/share/cloudstack-management/conf
-	ln -s /usr/share/tomcat6/lib debian/tmp/usr/share/cloudstack-management/lib
-	ln -s ../../../var/log/cloudstack/management debian/tmp/usr/share/cloudstack-management/logs
-	ln -s ../../../var/cache/cloudstack/management/temp debian/tmp/usr/share/cloudstack-management/temp
-	ln -s ../../../var/cache/cloudstack/management/work debian/tmp/usr/share/cloudstack-management/work
+	install -D server/target/cloud-server-4.2.0-SNAPSHOT.jar debian/tmp/usr/share/$(PACKAGE)-management/lib/$(PACKAGE)-server.jar
+	ln -s /usr/share/tomcat6/bin debian/tmp/usr/share/$(PACKAGE)-management/bin
+	ln -s ../../..$(SYSCONFDIR)/$(PACKAGE)/management debian/tmp/usr/share/$(PACKAGE)-management/conf
+	ln -s /usr/share/tomcat6/lib debian/tmp/usr/share/$(PACKAGE)-management/lib
+	ln -s ../../../var/log/$(PACKAGE)/management debian/tmp/usr/share/$(PACKAGE)-management/logs
+	ln -s ../../../var/cache/$(PACKAGE)/management/temp debian/tmp/usr/share/$(PACKAGE)-management/temp
+	ln -s ../../../var/cache/$(PACKAGE)/management/work debian/tmp/usr/share/$(PACKAGE)-management/work
 
 	# cloudstack-common
-	mkdir -p debian/tmp/usr/share/cloudstack-common
-	mkdir debian/tmp/usr/share/cloudstack-common/scripts
-	mkdir debian/tmp/usr/share/cloudstack-common/setup
-	cp -r scripts/installer debian/tmp/usr/share/cloudstack-common/scripts
-	cp -r scripts/network debian/tmp/usr/share/cloudstack-common/scripts
-	cp -r scripts/storage debian/tmp/usr/share/cloudstack-common/scripts
-	cp -r scripts/util debian/tmp/usr/share/cloudstack-common/scripts
-	cp -r scripts/vm debian/tmp/usr/share/cloudstack-common/scripts
+	mkdir -p debian/tmp/usr/share/$(PACKAGE)-common
+	mkdir debian/tmp/usr/share/$(PACKAGE)-common/scripts
+	mkdir debian/tmp/usr/share/$(PACKAGE)-common/setup
+	cp -r scripts/installer debian/tmp/usr/share/$(PACKAGE)-common/scripts
+	cp -r scripts/network debian/tmp/usr/share/$(PACKAGE)-common/scripts
+	cp -r scripts/storage debian/tmp/usr/share/$(PACKAGE)-common/scripts
+	cp -r scripts/util debian/tmp/usr/share/$(PACKAGE)-common/scripts
+	cp -r scripts/vm debian/tmp/usr/share/$(PACKAGE)-common/scripts
 	install -D client/target/utilities/bin/cloud-migrate-databases debian/tmp/usr/bin
 	install -D client/target/utilities/bin/cloud-set-guest-password debian/tmp/usr/bin
 	install -D client/target/utilities/bin/cloud-set-guest-sshkey debian/tmp/usr/bin
 	install -D client/target/utilities/bin/cloud-setup-databases debian/tmp/usr/bin
 	install -D client/target/utilities/bin/cloud-setup-management debian/tmp/usr/bin
-	install -D services/console-proxy/server/dist/systemvm.iso debian/tmp/usr/share/cloudstack-common/vms/systemvm.iso
-	install -D core/target/cloud-core-4.2.0-SNAPSHOT.jar debian/tmp/usr/share/cloudstack-common/lib/cloudstack-core.jar
-	install -D api/target/cloud-api-4.2.0-SNAPSHOT.jar debian/tmp/usr/share/cloudstack-common/lib/cloudstack-api.jar
+	install -D services/console-proxy/server/dist/systemvm.iso debian/tmp/usr/share/$(PACKAGE)-common/vms/systemvm.iso
 
 	# cloudstack-python
 	mkdir -p debian/tmp/usr/lib/python2.7/dist-packages
 	cp -r python/lib/cloud* debian/tmp/usr/lib/python2.7/dist-packages
 
 	# cloudstack-usage
-	mkdir debian/tmp/etc/cloud/usage
-	mkdir debian/tmp/var/log/cloudstack/usage
-	install -D usage/target/cloud-usage-4.2.0-SNAPSHOT.jar debian/tmp/usr/share/cloudstack-usage/lib/cloudstack-usage.jar
-	cp usage/target/transformed/* debian/tmp/etc/cloud/usage/
-	ln -s ../management/db.properties debian/tmp/etc/cloud/usage/db.properties
-	install -D packaging/debian/init/cloud-usage debian/tmp/etc/init.d
+	mkdir debian/tmp$(SYSCONFDIR)/$(PACKAGE)/usage
+	mkdir debian/tmp/var/log/$(PACKAGE)/usage
+	install -D usage/target/cloud-usage-4.2.0-SNAPSHOT.jar debian/tmp/usr/share/$(PACKAGE)-usage/lib/$(PACKAGE)-usage.jar
+	cp usage/target/transformed/* debian/tmp$(SYSCONFDIR)/$(PACKAGE)/usage/
+	ln -s ../management/db.properties debian/tmp$(SYSCONFDIR)/$(PACKAGE)/usage/db.properties
+	install -D packaging/debian/init/cloud-usage debian/tmp$(SYSCONFDIR)/init.d/$(PACKAGE)-usage
 
 	# cloudstack-awsapi
-	mkdir debian/tmp/var/log/cloudstack/awsapi
+	mkdir debian/tmp/var/log/$(PACKAGE)/awsapi
 
 	dh_installdirs
 	dh_install

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/20070ee0/packaging/debian/init/cloud-agent
----------------------------------------------------------------------
diff --git a/packaging/debian/init/cloud-agent b/packaging/debian/init/cloud-agent
index 8b64693..a264486 100755
--- a/packaging/debian/init/cloud-agent
+++ b/packaging/debian/init/cloud-agent
@@ -46,7 +46,7 @@ unset OPTIONS
 [ -r /etc/default/"$SHORTNAME" ] && source /etc/default/"$SHORTNAME"
 
 # The first existing directory is used for JAVA_HOME (if JAVA_HOME is not defined in $DEFAULT)
-JDK_DIRS="/usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-openjdk-i386 /usr/lib/jvm/java-6-openjdk-amd64
/usr/lib/jvm/java-6-sun /usr/lib/jvm/java-1.5.0-sun /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.5-ibm"
+JDK_DIRS="/usr/lib/jvm/java-7-openjdk-amd64 /usr/lib/jvm/java-7-openjdk-i386 /usr/lib/jvm/java-6-openjdk
/usr/lib/jvm/java-6-openjdk-i386 /usr/lib/jvm/java-6-openjdk-amd64 /usr/lib/jvm/java-6-sun"
 
 for jdir in $JDK_DIRS; do
     if [ -r "$jdir/bin/java" -a -z "${JAVA_HOME}" ]; then
@@ -55,9 +55,11 @@ for jdir in $JDK_DIRS; do
 done
 export JAVA_HOME
 
+ACP=`ls /usr/share/cloudstack-agent/lib/* | tr '\n' ':'`
+
 # We need to append the JSVC daemon JAR to the classpath
 # AgentShell implements the JSVC daemon methods
-export CLASSPATH="/usr/share/java/commons-daemon.jar:/usr/share/java/cloud-agent-kvm.jar:/etc/cloud/agent"
+export CLASSPATH="/usr/share/java/commons-daemon.jar:$ACP:/etc/cloudstack/agent:/usr/share/cloudstack-common/scripts"
 
 wait_for_network() {
     i=1
@@ -93,7 +95,7 @@ start() {
 
     wait_for_network
 
-    if start_daemon -p $PIDFILE $DAEMON -cp "$CLASSPATH" -pidfile "$PIDFILE" -errfile SYSLOG
-D jna.nosys=true $CLASS
+    if start_daemon -p $PIDFILE $DAEMON -cp "$CLASSPATH" -pidfile "$PIDFILE" -errfile SYSLOG
-Djna.nosys=true $CLASS
         RETVAL=$?
     then
         rc=0

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/20070ee0/packaging/debian/init/cloud-usage
----------------------------------------------------------------------
diff --git a/packaging/debian/init/cloud-usage b/packaging/debian/init/cloud-usage
index 6b17ea8..3421cd1 100755
--- a/packaging/debian/init/cloud-usage
+++ b/packaging/debian/init/cloud-usage
@@ -45,7 +45,7 @@ unset OPTIONS
 [ -r @SYSCONFDIR@/default/"$SHORTNAME" ] && source @SYSCONFDIR@/default/"$SHORTNAME"
 
 # The first existing directory is used for JAVA_HOME (if JAVA_HOME is not defined in $DEFAULT)
-JDK_DIRS="/usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-openjdk-i386 /usr/lib/jvm/java-6-openjdk-amd64
/usr/lib/jvm/java-6-sun /usr/lib/jvm/jre-1.6.0 /usr/lib/j2sdk1.5-sun /usr/lib/jre-openjdk"
+JDK_DIRS="/usr/lib/jvm/java-7-openjdk-amd64 /usr/lib/jvm/java-7-openjdk-i386 /usr/lib/jvm/java-6-openjdk
/usr/lib/jvm/java-6-openjdk-i386 /usr/lib/jvm/java-6-openjdk-amd64 /usr/lib/jvm/java-6-sun"
 
 for jdir in $JDK_DIRS; do
     if [ -r "$jdir/bin/java" -a -z "${JAVA_HOME}" ]; then

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/20070ee0/packaging/debian/replace.properties
----------------------------------------------------------------------
diff --git a/packaging/debian/replace.properties b/packaging/debian/replace.properties
index d891e79..fee1def 100644
--- a/packaging/debian/replace.properties
+++ b/packaging/debian/replace.properties
@@ -26,37 +26,37 @@ COMPONENTS-SPEC=components-premium.xml
 AWSAPILOG=awsapi.log
 REMOTEHOST=localhost
 AGENTCLASSPATH=
-AGENTLOG=/var/log/cloud/agent/agent.log
-AGENTLOGDIR=/var/log/cloud/agent/
-AGENTSYSCONFDIR=/etc/cloud/agent
-APISERVERLOG=/var/log/cloud/management/apilog.log
-AWSAPILOG=/var/log/cloud/awsapi/awsapi.log
+AGENTLOG=/var/log/cloudstack/agent/agent.log
+AGENTLOGDIR=/var/log/cloudstack/agent/
+AGENTSYSCONFDIR=/etc/cloudstack/agent
+APISERVERLOG=/var/log/cloudstack/management/apilog.log
+AWSAPILOG=/var/log/cloudstack/awsapi/awsapi.log
 BINDIR=/usr/bin
-COMMONLIBDIR=/usr/share/java
+COMMONLIBDIR=/usr/share/cloudstack-common
 CONFIGUREVARS=
 DEPSCLASSPATH=
 DOCDIR=
-IPALOCATORLOG=/var/log/cloud/management/ipallocator.log
+IPALOCATORLOG=/var/log/cloudstack/management/ipallocator.log
 JAVADIR=/usr/share/cloudstack-management/webapps/client/WEB-INF/lib
 LIBEXECDIR=/usr/libexec
 LOCKDIR=/var/lock
 MSCLASSPATH=
-MSCONF=/etc/cloud/management
+MSCONF=/etc/cloudstack/management
 MSENVIRON=/usr/share/cloudstack-management
-MSLOG=/var/log/cloud/management/management-server.log
-MSLOGDIR=/var/log/cloud/management/
+MSLOG=/var/log/cloudstack/management/management-server.log
+MSLOGDIR=/var/log/cloudstack/management/
 MSMNTDIR=/var/lib/cloud/mnt
 MSUSER=cloud
 PIDDIR=/var/run
 PLUGINJAVADIR=
 PREMIUMJAVADIR=
 PYTHONDIR=/usr/lib/python2.6/site-packages/
-SERVERSYSCONFDIR=/etc/cloud/server
+SERVERSYSCONFDIR=/etc/cloudstack/server
 SETUPDATADIR=/usr/share/cloudstack-management/setup
 SYSCONFDIR=/etc
 SYSTEMCLASSPATH=
 SYSTEMJARS=
 USAGECLASSPATH=
-USAGELOG=/var/log/cloud/usage
-USAGESYSCONFDIR=/etc/cloud/usage
+USAGELOG=/var/log/cloudstack/usage
+USAGESYSCONFDIR=/etc/cloudstack/usage
 PACKAGE=cloud


Mime
View raw message