You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2017/10/30 08:44:18 UTC
[cloudstack] branch CLOUDSTACK-10012 updated: additional cleanups
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 d2f951e additional cleanups
d2f951e is described below
commit d2f951e2c3364f3c40b6cdbc11448b8010352f46
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Mon Oct 30 14:13:58 2017 +0530
additional cleanups
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
T#
---
INSTALL.md | 4 +---
client/bindir/cloud-setup-management.in | 3 ---
client/pom.xml | 1 -
engine/service/src/main/webapp/WEB-INF/log4j.xml | 14 ++-----------
packaging/centos63/cloud-management.rc | 10 ++--------
packaging/centos63/cloud.spec | 3 +++
packaging/debian/init/cloud-management | 14 ++++++-------
packaging/systemd/cloudstack-management.default | 25 +++++-------------------
pom.xml | 5 -----
python/lib/cloudutils/serviceConfigServer.py | 16 ++-------------
10 files changed, 22 insertions(+), 73 deletions(-)
diff --git a/INSTALL.md b/INSTALL.md
index c69018d..626df91 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -15,7 +15,7 @@ was tested against a CentOS 6.5 x86_64 setup.
Install tools and dependencies used for development:
$ yum install git ant ant-devel java-1.6.0-openjdk java-1.6.0-openjdk-devel
- mysql mysql-server tomcat6 mkisofs gcc python MySQL-python openssh-clients wget
+ mysql mysql-server mkisofs gcc python MySQL-python openssh-clients wget
# yum -y update
# yum -y install java-1.7.0-openjdk
@@ -124,7 +124,6 @@ To create debs install the following extra packages:
# apt-get -y install python-mysqldb
# apt-get -y install debhelper
- # apt-get -y install tomcat6
Then:
@@ -138,7 +137,6 @@ All the deb packages will be located one level down.
To create rpms, install the following extra packages:
# yum -y install rpm-build
- # yum -y install tomcat6
# yum -y install ws-commons-util
# yum -y instal gcc
# yum -y install glibc-devel
diff --git a/client/bindir/cloud-setup-management.in b/client/bindir/cloud-setup-management.in
index de76007..87822ef 100755
--- a/client/bindir/cloud-setup-management.in
+++ b/client/bindir/cloud-setup-management.in
@@ -29,13 +29,10 @@ if __name__ == '__main__':
parser = OptionParser()
parser.add_option("--https", action="store_true", dest="https", help="Enable HTTPs connection of management server")
- parser.add_option("--tomcat7", action="store_true", dest="tomcat7", help="Use Tomcat7 configuration files in Management Server")
parser.add_option("--no-start", action="store_true", dest="nostart", help="Do not start management server after successful configuration")
(options, args) = parser.parse_args()
if options.https:
glbEnv.svrMode = "HttpsServer"
- if options.tomcat7:
- glbEnv.svrConf = "Tomcat7"
if options.nostart:
glbEnv.noStart = True
diff --git a/client/pom.xml b/client/pom.xml
index 5090c90..d5c9ea1 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -887,7 +887,6 @@
<get src="http://downloads.sourceforge.net/sevenzip/7z920-x64.msi" dest="target" verbose="false" usetimestamp="true"/>
<get src="https://www.python.org/ftp/python/2.7.6/python-2.7.6.amd64.msi" dest="target" verbose="false" usetimestamp="true"/>
<get src="http://dev.mysql.com/get/Downloads/MySQL-5.1/mysql-5.1.73-winx64.msi" dest="target" verbose="false" usetimestamp="true"/>
- <get src="http://mirror.sdunix.com/apache/tomcat/tomcat-6/v6.0.39/bin/apache-tomcat-6.0.39.exe" dest="target" verbose="false" usetimestamp="true"/>
<get src="http://downloads.sourceforge.net/project/cdrtoolswin/1.0/Binaries/CDR-Tools.exe?r=&ts=1398764640&use_mirror=kaz" dest="target" verbose="false" usetimestamp="true"/>
<get src="https://bootstrap.pypa.io/ez_setup.py" dest="target" verbose="false" usetimestamp="true"/>
</target>
diff --git a/engine/service/src/main/webapp/WEB-INF/log4j.xml b/engine/service/src/main/webapp/WEB-INF/log4j.xml
index df46461..19d48b4 100644
--- a/engine/service/src/main/webapp/WEB-INF/log4j.xml
+++ b/engine/service/src/main/webapp/WEB-INF/log4j.xml
@@ -25,17 +25,7 @@
<param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
</layout>
</appender>
-<!--
- <appender name="FILE_APPENDER" class="org.apache.log4j.DailyRollingFileAppender">
- <param name="File" value="${catalina.home}/logs/webapp.txt"/>
- <param name="DatePattern" value="'-'yyyy-MM-dd'.txt'"/>
- <param name="Threshold" value="DEBUG"/>
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss} %-4p [%t] %C{2} - %m%n"/>
- </layout>
- </appender>
- -->
-
+
<!-- Spring -->
<logger name="org.springframework" additivity="false">
<level value="DEBUG"/>
@@ -46,4 +36,4 @@
<level value="DEBUG"/>
<appender-ref ref="CONSOLE"/>
</root>
-</log4j:configuration>
\ No newline at end of file
+</log4j:configuration>
diff --git a/packaging/centos63/cloud-management.rc b/packaging/centos63/cloud-management.rc
index 38984ac..0ef5fc4 100755
--- a/packaging/centos63/cloud-management.rc
+++ b/packaging/centos63/cloud-management.rc
@@ -42,7 +42,7 @@ USER=cloud
export HOME="/var/cloudstack/management"
unset OPTIONS
-[ -r /etc/sysconfig/default/"$SHORTNAME" ] && source /etc/sysconfig/default/"$SHORTNAME"
+[ -r /etc/default/"$SHORTNAME" ] && source /etc/default/"$SHORTNAME"
setJavaHome() {
# use $JAVA_HOME if defined
@@ -71,13 +71,7 @@ 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:/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 "
-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 "
-fi
+CLASSPATH="$JARS:$CLASSPATH"
start() {
if [ -s "$PIDFILE" ] && kill -0 $(cat "$PIDFILE") >/dev/null 2>&1; then
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index 24ff89c..b26d8b6 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -240,6 +240,7 @@ mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/cache/%{name}/management/temp
mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/%{name}/mnt
mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/%{name}/management
mkdir -p ${RPM_BUILD_ROOT}%{_initrddir}
+mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/default
mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/profile.d
mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/sudoers.d
@@ -304,6 +305,7 @@ install -D client/target/pythonlibs/jasypt-1.9.2.jar ${RPM_BUILD_ROOT}%{_datadir
install -D packaging/centos63/cloud-ipallocator.rc ${RPM_BUILD_ROOT}%{_initrddir}/%{name}-ipallocator
install -D packaging/centos63/cloud-management.rc ${RPM_BUILD_ROOT}%{_initrddir}/%{name}-management
install -D server/target/conf/cloudstack-sudoers ${RPM_BUILD_ROOT}%{_sysconfdir}/sudoers.d/%{name}-management
+install -D packaging/systemd/cloudstack-management.default ${RPM_BUILD_ROOT}%{_sysconfdir}/default/%{name}-management
#install -D server/target/conf/cloudstack-catalina.logrotate ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}-catalina
chmod 440 ${RPM_BUILD_ROOT}%{_sysconfdir}/sudoers.d/%{name}-management
@@ -519,6 +521,7 @@ pip install --upgrade /usr/share/cloudstack-marvin/Marvin-*.tar.gz
%dir %attr(0770,cloud,cloud) %{_localstatedir}/%{name}/management
%dir %attr(0770,root,cloud) %{_localstatedir}/cache/%{name}/management
%dir %attr(0770,root,cloud) %{_localstatedir}/log/%{name}/management
+%config(noreplace) %{_sysconfdir}/default/%{name}-management
%config(noreplace) %{_sysconfdir}/sudoers.d/%{name}-management
%config(noreplace) %attr(0640,root,cloud) %{_sysconfdir}/%{name}/management/db.properties
%config(noreplace) %attr(0640,root,cloud) %{_sysconfdir}/%{name}/management/server.properties
diff --git a/packaging/debian/init/cloud-management b/packaging/debian/init/cloud-management
index 929d604..580f683 100755
--- a/packaging/debian/init/cloud-management
+++ b/packaging/debian/init/cloud-management
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# /etc/init.d/cloudstack-management -- startup script for the Tomcat 6 servlet engine
+# /etc/init.d/cloudstack-management -- startup script for CloudStack
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
@@ -26,8 +26,8 @@
# Should-Stop: $named
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
-# Short-Description: Start Tomcat (CloudStack).
-# Description: Start the Tomcat servlet engine that runs the CloudStack Management Server.
+# Short-Description: Start CloudStack.
+# Description: Start the CloudStack Management Server.
### END INIT INFO
PATH=/bin:/usr/bin:/sbin:/usr/sbin
@@ -38,8 +38,6 @@ DEFAULT=/etc/default/$NAME
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:/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
@@ -50,8 +48,7 @@ if [ `id -u` -ne 0 ]; then
echo "You need root privileges to run this script"
exit 1
fi
-
-# Make sure tomcat is started with system locale
+
if [ -r /etc/default/locale ]; then
. /etc/default/locale
export LANG
@@ -77,6 +74,9 @@ if [ -f "$DEFAULT" ]; then
. "$DEFAULT"
fi
+JARS=$(ls /usr/share/cloudstack-management/lib/*.jar | tr '\n' ':' | sed s'/.$//')
+CLASSPATH="$JARS:$CLASSPATH"
+
[ -f "$DAEMON" ] || exit 0
# Look for Java Secure Sockets Extension (JSSE) JARs
diff --git a/packaging/systemd/cloudstack-management.default b/packaging/systemd/cloudstack-management.default
index 85ae3ba..fbdb256 100644
--- a/packaging/systemd/cloudstack-management.default
+++ b/packaging/systemd/cloudstack-management.default
@@ -5,9 +5,9 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,36 +15,21 @@
# specific language governing permissions and limitations
# under the License.
-# Required for a tocmat cloned service
-SERVICE_NAME=cloudstack-management
-
# Where your java installation lives
#JAVA_HOME="/usr/lib/jvm/java"
-# Where your cloudstack-management installation lives
-CATALINA_BASE="/usr/share/cloudstack-management"
-CATALINA_HOME="/usr/share/cloudstack-management"
-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"
+ 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 -Djava.security.properties=/etc/cloudstack/management/java.security.ciphers "
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"
+ 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 -Djava.security.properties=/etc/cloudstack/management/java.security.ciphers "
fi
CLOUDSTACK_USER="cloud"
-SECURITY_MANAGER="false"
-
-SHUTDOWN_WAIT="30"
-
-SHUTDOWN_VERBOSE="false"
-
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"
+CLASSPATH="/etc/cloudstack/management:/usr/share/cloudstack-common:/usr/share/cloudstack-management/setup:/usr/share/cloudstack-management:/usr/share/java/mysql-connector-java.jar:/usr/share/java/commons-daemon.jar"
BOOTSTRAP_CLASS=org.apache.cloudstack.ServerDaemon
diff --git a/pom.xml b/pom.xml
index a899f3b..213fd10 100644
--- a/pom.xml
+++ b/pom.xml
@@ -812,11 +812,6 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat7-maven-plugin</artifactId>
- <version>2.2</version>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.8</version>
diff --git a/python/lib/cloudutils/serviceConfigServer.py b/python/lib/cloudutils/serviceConfigServer.py
index 60439f9..21ddd06 100644
--- a/python/lib/cloudutils/serviceConfigServer.py
+++ b/python/lib/cloudutils/serviceConfigServer.py
@@ -71,27 +71,15 @@ class cloudManagementConfig(serviceCfgBase):
#add DNAT 443 to 8250
if not bash("iptables-save |grep PREROUTING | grep 8250").isSuccess():
bash("iptables -A PREROUTING -t nat -p tcp --dport 443 -j REDIRECT --to-port 8250 ")
-
- #generate 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)
-
- if not cmd.isSuccess():
- raise CloudInternalException(cmd.getErrMsg())
- if not self.syscfg.env.svrConf == "Tomcat7":
- cfo = configFileOps("/etc/cloudstack/management/tomcat6.conf", self)
- cfo.add_lines("JAVA_OPTS+=\" -Djavax.net.ssl.trustStore=%s \""%keyPath)
elif self.syscfg.env.svrMode == "HttpsServer":
- if not bash("iptables-save |grep PREROUTING | grep 6443").isSuccess():
- bash("iptables -A PREROUTING -t nat -p tcp --dport 443 -j REDIRECT --to-port 6443")
+ if not bash("iptables-save |grep PREROUTING | grep 8443").isSuccess():
+ bash("iptables -A PREROUTING -t nat -p tcp --dport 443 -j REDIRECT --to-port 8443")
bash("touch /var/run/cloudstack-management.pid")
bash("chown cloud.cloud /var/run/cloudstack-management.pid")
#distro like sl 6.1 needs this folder, or tomcat6 failed to start
checkHostName()
bash("mkdir -p /var/lib/cloudstack/")
bash("chown cloud:cloud -R /var/lib/cloudstack/")
- #bash("chmod +x -R /usr/share/cloudstack-management/webapps/client/WEB-INF/classes/scripts/")
#set max process per account is unlimited
if os.path.exists("/etc/security/limits.conf"):
cfo = configFileOps("/etc/security/limits.conf")
--
To stop receiving notification emails like this one, please contact
['"commits@cloudstack.apache.org" <co...@cloudstack.apache.org>'].