This is an automated email from the ASF dual-hosted git repository.
bhaisaab pushed a commit to branch CLOUDSTACK-10012
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/CLOUDSTACK-10012 by this push:
new 5ded0d8 fix script issues
5ded0d8 is described below
commit 5ded0d8ac171c506d76968c5b9fc3bae5beb1903
Author: Rohit Yadav <[email protected]>
AuthorDate: Fri Oct 27 17:31:01 2017 +0530
fix script issues
Signed-off-by: Rohit Yadav <[email protected]>
---
debian/control | 5 -----
packaging/centos63/cloud-management.rc | 6 +++---
packaging/centos63/cloud.spec | 3 ---
packaging/centos7/cloud.spec | 3 ---
packaging/debian/init/cloud-management | 2 +-
packaging/systemd/cloudstack-management.default | 6 +++---
6 files changed, 7 insertions(+), 18 deletions(-)
diff --git a/debian/control b/debian/control
index 98ab7f1..009ed20 100644
--- a/debian/control
+++ b/debian/control
@@ -37,11 +37,6 @@ Description: CloudStack usage monitor
The CloudStack usage monitor provides usage accounting across the entire
cloud for
cloud operators to charge based on usage parameters.
-Package: cloudstack-cli
-Architecture: all
-Depends: ${misc:Depends}, cloudstack-common (= ${source:Version})
-Description: The CloudStack CLI called CloudMonkey
-
Package: cloudstack-docs
Architecture: all
Depends: ${misc:Depends}
diff --git a/packaging/centos63/cloud-management.rc
b/packaging/centos63/cloud-management.rc
index 3a5d43d..38984ac 100755
--- a/packaging/centos63/cloud-management.rc
+++ b/packaging/centos63/cloud-management.rc
@@ -71,12 +71,12 @@ setJavaHome() {
setJavaHome
JARS=$(ls /usr/share/cloudstack-management/lib/*.jar | tr '\n' ':' | sed
s'/.$//')
-CLASSPATH="/etc/cloudstack/management:/usr/share/cloudstack-common:/usr/share/cloudstack-management/setup:/usr/share/cloudstack-management:$JARS:/usr/share/java/mysql-connector-java.jar"
+CLASSPATH="/etc/cloudstack/management:/usr/share/cloudstack-common:/usr/share/cloudstack-management/setup:/usr/share/cloudstack-management:$JARS:/usr/share/java/mysql-connector-java.jar:/usr/share/java/commons-daemon.jar:$CLASSPATH"
if [ -r "/etc/cloudstack/management/cloud.jks" ] ; then
- JAVA_OPTS="-Djava.awt.headless=true -Dcom.sun.management.jmxremote=false
-Xmx2g -XX:+HeapDumpOnOutOfMemoryError
-XX:HeapDumpPath=/var/log/cloudstack/management/ -XX:PermSize=512M
-XX:MaxPermSize=800m
-Djavax.net.ssl.trustStore=/etc/cloudstack/management/cloud.jks
-Djavax.net.ssl.trustStorePassword=vmops.com
-Djetty.requestlog=$LOGDIR/request.log "
+ JAVA_OPTS="-Djava.awt.headless=true -Dcom.sun.management.jmxremote=false
-Xmx2g -XX:+HeapDumpOnOutOfMemoryError
-XX:HeapDumpPath=/var/log/cloudstack/management/ -XX:PermSize=512M
-XX:MaxPermSize=800m
-Djavax.net.ssl.trustStore=/etc/cloudstack/management/cloud.jks
-Djavax.net.ssl.trustStorePassword=vmops.com "
else
- JAVA_OPTS="-Djava.awt.headless=true -Dcom.sun.management.jmxremote=false
-Xmx2g -XX:+HeapDumpOnOutOfMemoryError
-XX:HeapDumpPath=/var/log/cloudstack/management/ -XX:PermSize=512M
-XX:MaxPermSize=800m -Djetty.requestlog=$LOGDIR/request.log "
+ JAVA_OPTS="-Djava.awt.headless=true -Dcom.sun.management.jmxremote=false
-Xmx2g -XX:+HeapDumpOnOutOfMemoryError
-XX:HeapDumpPath=/var/log/cloudstack/management/ -XX:PermSize=512M
-XX:MaxPermSize=800m "
fi
start() {
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index dbfdd5d..24ff89c 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -73,8 +73,6 @@ Requires: nfs-utils
Requires: wget
Requires: mysql
Requires: mysql-connector-java
-Requires: ws-commons-util
-Requires: jpackage-utils
Requires: sudo
Requires: /sbin/service
Requires: /sbin/chkconfig
@@ -166,7 +164,6 @@ The CloudStack usage calculation service
%package cli
Summary: Apache CloudStack CLI
-Provides: python-cloudmonkey
Provides: python-marvin
Group: System Environment/Libraries
%description cli
diff --git a/packaging/centos7/cloud.spec b/packaging/centos7/cloud.spec
index 4f743e5..ebad5e7 100644
--- a/packaging/centos7/cloud.spec
+++ b/packaging/centos7/cloud.spec
@@ -71,8 +71,6 @@ Requires: nfs-utils
Requires: wget
Requires: mysql
Requires: mysql-connector-java
-Requires: ws-commons-util
-Requires: jpackage-utils
Requires: sudo
Requires: /sbin/service
Requires: /sbin/chkconfig
@@ -139,7 +137,6 @@ The CloudStack usage calculation service
%package cli
Summary: Apache CloudStack CLI
-Provides: python-cloudmonkey
Provides: python-marvin
Group: System Environment/Libraries
%description cli
diff --git a/packaging/debian/init/cloud-management
b/packaging/debian/init/cloud-management
index fe275dd..929d604 100755
--- a/packaging/debian/init/cloud-management
+++ b/packaging/debian/init/cloud-management
@@ -39,7 +39,7 @@ USER="cloud"
GROUP="cloud"
CLOUDSTACK_PID="/var/run/$NAME.pid"
JARS=$(ls /usr/share/cloudstack-management/lib/*.jar | tr '\n' ':' | sed
s'/.$//')
-CLASSPATH="$JARS:/etc/cloudstack/management:/usr/share/cloudstack-common:/usr/share/cloudstack-management/setup:/usr/share/cloudstack-management:/usr/share/cloudstack-management/lib/cloudstack.jar:/usr/share/java/mysql-connector-java.jar:$CLASSPATH"
+CLASSPATH="$JARS:/etc/cloudstack/management:/usr/share/cloudstack-common:/usr/share/cloudstack-management/setup:/usr/share/cloudstack-management:/usr/share/cloudstack-management/lib/cloudstack.jar:/usr/share/java/mysql-connector-java.jar:/usr/share/java/commons-daemon.jar:$CLASSPATH"
# We have to explicitly set the HOME variable to the homedir from the user
"cloud"
# This is because various scripts run by the management server read the HOME
variable
diff --git a/packaging/systemd/cloudstack-management.default
b/packaging/systemd/cloudstack-management.default
index baa20aa..85ae3ba 100644
--- a/packaging/systemd/cloudstack-management.default
+++ b/packaging/systemd/cloudstack-management.default
@@ -28,9 +28,9 @@ JASPER_HOME="/usr/share/cloudstack-management"
CATALINA_TMPDIR="/usr/share/cloudstack-management/temp"
if [ -r "/etc/cloudstack/management/cloud.jks" ] ; then
- JAVA_OPTS="-Djava.awt.headless=true -Dcom.sun.management.jmxremote=false
-Xmx2g -XX:+HeapDumpOnOutOfMemoryError
-XX:HeapDumpPath=/var/log/cloudstack/management/ -XX:PermSize=512M
-XX:MaxPermSize=800m
-Djavax.net.ssl.trustStore=/etc/cloudstack/management/cloud.jks
-Djavax.net.ssl.trustStorePassword=vmops.com
-Djetty.requestlog=/var/log/cloudstack/management/request.log"
+ JAVA_OPTS="-Djava.awt.headless=true -Dcom.sun.management.jmxremote=false
-Xmx2g -XX:+HeapDumpOnOutOfMemoryError
-XX:HeapDumpPath=/var/log/cloudstack/management/ -XX:PermSize=512M
-XX:MaxPermSize=800m
-Djavax.net.ssl.trustStore=/etc/cloudstack/management/cloud.jks
-Djavax.net.ssl.trustStorePassword=vmops.com"
else
- JAVA_OPTS="-Djava.awt.headless=true -Dcom.sun.management.jmxremote=false
-Xmx2g -XX:+HeapDumpOnOutOfMemoryError
-XX:HeapDumpPath=/var/log/cloudstack/management/ -XX:PermSize=512M
-XX:MaxPermSize=800m
-Djetty.requestlog=/var/log/cloudstack/management/request.log"
+ JAVA_OPTS="-Djava.awt.headless=true -Dcom.sun.management.jmxremote=false
-Xmx2g -XX:+HeapDumpOnOutOfMemoryError
-XX:HeapDumpPath=/var/log/cloudstack/management/ -XX:PermSize=512M
-XX:MaxPermSize=800m"
fi
CLOUDSTACK_USER="cloud"
@@ -45,6 +45,6 @@ CLOUDSTACK_PID="/var/run/cloudstack-management.pid"
LOGDIR="/var/log/cloudstack/management"
-CLASSPATH="/etc/cloudstack/management:/usr/share/cloudstack-common:/usr/share/cloudstack-management/setup:/usr/share/cloudstack-management:/usr/share/java/mysql-connector-java.jar"
+CLASSPATH="/etc/cloudstack/management:/usr/share/cloudstack-common:/usr/share/cloudstack-management/setup:/usr/share/cloudstack-management:/usr/share/java/mysql-connector-java.jar:$CLASSPATH"
BOOTSTRAP_CLASS=org.apache.cloudstack.ServerDaemon
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
