GV

GeezerVison

The World Wide Web, restored to 800 pixels of glory.

Home|About|Gaming cabinet|Archives|How it works|Starter sites

On this site

  • Sign in
  • ActionsCI/CD and automation
  • CodespacesCloud development environments
  • All Features
  • Documentation
  • Training
  • Certifications
  • Build with Copilot
  • Customize Copilot
  • Integrations
  • Trending repos
  • GitHub Sponsors
  • Developer articles
  • Enterprises

This view

  • Original page
  • New address

GeezerVison is showing github.com — CLOUDSTACK-9049: fix Centos7 with Tomcat7 packaging and python libs · folkcode/cloudstack@3c4a24c

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
  • client/bindir
    • cloud-setup-management.in
  • packaging/centos7
    • cloud.spec
  • python/lib/cloudutils
    • globalEnv.py
    • serviceConfigServer.py
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎client/bindir/cloud-setup-management.in‎

Copy file name to clipboardExpand all lines: client/bindir/cloud-setup-management.in
+3Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,12 @@ if __name__ == '__main__':
2929

3030
parser = OptionParser()
3131
parser.add_option("--https", action="store_true", dest="https", help="Enable HTTPs connection of management server")
32+
parser.add_option("--tomcat7", action="store_true", dest="tomcat7", help="Use Tomcat7 configuration files in Management Server")
3233
(options, args) = parser.parse_args()
3334
if options.https:
3435
glbEnv.svrMode = "HttpsServer"
36+
if options.tomcat7:
37+
glbEnv.svrConf = "Tomcat7"
3538

3639
glbEnv.mode = "Server"
3740

Collapse file

‎packaging/centos7/cloud.spec‎

Copy file name to clipboardExpand all lines: packaging/centos7/cloud.spec
+10-7Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -249,16 +249,16 @@ cp -r client/target/cloud-client-ui-%{_maventag}/* ${RPM_BUILD_ROOT}%{_datadir}/
249249
rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/scripts
250250
rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/vms
251251

252-
for name in catalina.properties db.properties log4j-cloud.xml web.xml \
253-
server.xml commons-logging.properties environment.properties java.security.ciphers tomcat-users.xml
252+
for name in db.properties log4j-cloud.xml server7-nonssl.xml server7-ssl.xml \
253+
commons-logging.properties catalina.policy catalina.properties classpath.conf \
254+
tomcat-users.xml web.xml environment.properties java.security.ciphers
254255
do
255-
cp packaging/centos7/tomcat7/$name \
256+
mv ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/$name \
256257
${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/$name
257-
rm -f ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/$name
258258
done
259259

260-
#ln -s %{_sysconfdir}/%{name}/management/log4j-cloud.xml \
261-
# ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/log4j-cloud.xml
260+
ln -s %{_sysconfdir}/%{name}/management/log4j-cloud.xml \
261+
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/log4j-cloud.xml
262262

263263
mv ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/context.xml \
264264
${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/Catalina/localhost/client
@@ -438,10 +438,13 @@ fi
438438
%config(noreplace) %attr(0640,root,cloud) %{_sysconfdir}/%{name}/management/db.properties
439439
%config(noreplace) %{_sysconfdir}/%{name}/management/log4j-cloud.xml
440440
%config(noreplace) %{_sysconfdir}/%{name}/management/Catalina/localhost/client/context.xml
441+
%config(noreplace) %{_sysconfdir}/%{name}/management/catalina.policy
441442
%config(noreplace) %{_sysconfdir}/%{name}/management/catalina.properties
443+
%config(noreplace) %{_sysconfdir}/%{name}/management/classpath.conf
444+
%config(noreplace) %{_sysconfdir}/%{name}/management/server7-nonssl.xml
445+
%config(noreplace) %{_sysconfdir}/%{name}/management/server7-ssl.xml
442446
%config(noreplace) %{_sysconfdir}/%{name}/management/tomcat-users.xml
443447
%config(noreplace) %{_sysconfdir}/%{name}/management/web.xml
444-
%config(noreplace) %{_sysconfdir}/%{name}/management/server.xml
445448
%config(noreplace) %{_sysconfdir}/%{name}/management/environment.properties
446449
%config(noreplace) %{_sysconfdir}/%{name}/management/java.security.ciphers
447450
%config(noreplace) %{_sysconfdir}/%{name}/management/commons-logging.properties
Collapse file

‎python/lib/cloudutils/globalEnv.py‎

Copy file name to clipboardExpand all lines: python/lib/cloudutils/globalEnv.py
+2Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ def __init__(self):
2222
self.svrMode = None
2323
#myCloud/Agent/Console
2424
self.agentMode = None
25+
#Tomcat6/Tomcat7
26+
self.svrConf = None
2527
#debug
2628
self.debug = False
2729
#management server IP
Collapse file

‎python/lib/cloudutils/serviceConfigServer.py‎

Copy file name to clipboardExpand all lines: python/lib/cloudutils/serviceConfigServer.py
+35-19Lines changed: 35 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -79,30 +79,43 @@ def checkHostName():
7979

8080
if not cmd.isSuccess():
8181
raise CloudInternalException(cmd.getErrMsg())
82-
82+
if not self.syscfg.env.svrConf == "Tomcat7":
8383
cfo = configFileOps("/etc/cloudstack/management/tomcat6.conf", self)
8484
cfo.add_lines("JAVA_OPTS+=\" -Djavax.net.ssl.trustStore=%s \""%keyPath)
8585
elif self.syscfg.env.svrMode == "HttpsServer":
86-
if not os.path.exists("/etc/cloudstack/management/server-ssl.xml") or not os.path.exists("/etc/cloudstack/management/tomcat6-ssl.conf"):
87-
raise CloudRuntimeException("Cannot find /etc/cloudstack/management/server-ssl.xml or /etc/cloudstack/management/tomcat6-ssl.conf, https enables failed")
88-
if os.path.exists("/etc/cloudstack/management/server.xml"):
89-
bash("rm -f /etc/cloudstack/management/server.xml")
90-
if os.path.exists("/etc/cloudstack/management/tomcat6.conf"):
91-
bash("rm -f /etc/cloudstack/management/tomcat6.conf")
92-
bash("ln -s /etc/cloudstack/management/server-ssl.xml /etc/cloudstack/management/server.xml")
93-
bash("ln -s /etc/cloudstack/management/tomcat6-ssl.conf /etc/cloudstack/management/tomcat6.conf")
86+
if self.syscfg.env.svrConf == "Tomcat7":
87+
if not os.path.exists("/etc/cloudstack/management/server7-ssl.xml"):
88+
raise CloudRuntimeException("Cannot find /etc/cloudstack/management/server7-ssl.xml, https enable failed")
89+
if os.path.exists("/etc/cloudstack/management/server.xml"):
90+
bash("rm -f /etc/cloudstack/management/server.xml")
91+
bash("ln -s /etc/cloudstack/management/server7-ssl.xml /etc/cloudstack/management/server.xml")
92+
else:
93+
if not os.path.exists("/etc/cloudstack/management/server-ssl.xml") or not os.path.exists("/etc/cloudstack/management/tomcat6-ssl.conf"):
94+
raise CloudRuntimeException("Cannot find /etc/cloudstack/management/server-ssl.xml or /etc/cloudstack/management/tomcat6-ssl.conf, https enable failed")
95+
if os.path.exists("/etc/cloudstack/management/server.xml"):
96+
bash("rm -f /etc/cloudstack/management/server.xml")
97+
if os.path.exists("/etc/cloudstack/management/tomcat6.conf"):
98+
bash("rm -f /etc/cloudstack/management/tomcat6.conf")
99+
bash("ln -s /etc/cloudstack/management/server-ssl.xml /etc/cloudstack/management/server.xml")
100+
bash("ln -s /etc/cloudstack/management/tomcat6-ssl.conf /etc/cloudstack/management/tomcat6.conf")
94101
if not bash("iptables-save |grep PREROUTING | grep 6443").isSuccess():
95102
bash("iptables -A PREROUTING -t nat -p tcp --dport 443 -j REDIRECT --to-port 6443")
96103
else:
97-
if not os.path.exists("/etc/cloudstack/management/server-nonssl.xml") or not os.path.exists("/etc/cloudstack/management/tomcat6-nonssl.conf"):
98-
raise CloudRuntimeException("Cannot find /etc/cloudstack/management/server-nonssl.xml or /etc/cloudstack/management/tomcat6-nonssl.conf, https enables failed")
99-
if os.path.exists("/etc/cloudstack/management/server.xml"):
100-
bash("rm -f /etc/cloudstack/management/server.xml")
101-
if os.path.exists("/etc/cloudstack/management/tomcat6.conf"):
102-
bash("rm -f /etc/cloudstack/management/tomcat6.conf")
103-
bash("ln -s /etc/cloudstack/management/server-nonssl.xml /etc/cloudstack/management/server.xml")
104-
bash("ln -s /etc/cloudstack/management/tomcat6-nonssl.conf /etc/cloudstack/management/tomcat6.conf")
105-
104+
if self.syscfg.env.svrConf == "Tomcat7":
105+
if not os.path.exists("/etc/cloudstack/management/server7-nonssl.xml"):
106+
raise CloudRuntimeException("Cannot find /etc/cloudstack/management/server7-nonssl.xml, https enable failed")
107+
if os.path.exists("/etc/cloudstack/management/server.xml"):
108+
bash("rm -f /etc/cloudstack/management/server.xml")
109+
bash("ln -s /etc/cloudstack/management/server7-nonssl.xml /etc/cloudstack/management/server.xml")
110+
else:
111+
if not os.path.exists("/etc/cloudstack/management/server-nonssl.xml") or not os.path.exists("/etc/cloudstack/management/tomcat6-nonssl.conf"):
112+
raise CloudRuntimeException("Cannot find /etc/cloudstack/management/server-nonssl.xml or /etc/cloudstack/management/tomcat6-nonssl.conf, https enable failed")
113+
if os.path.exists("/etc/cloudstack/management/server.xml"):
114+
bash("rm -f /etc/cloudstack/management/server.xml")
115+
if os.path.exists("/etc/cloudstack/management/tomcat6.conf"):
116+
bash("rm -f /etc/cloudstack/management/tomcat6.conf")
117+
bash("ln -s /etc/cloudstack/management/server-nonssl.xml /etc/cloudstack/management/server.xml")
118+
bash("ln -s /etc/cloudstack/management/tomcat6-nonssl.conf /etc/cloudstack/management/tomcat6.conf")
106119
bash("touch /var/run/cloudstack-management.pid")
107120
bash("chown cloud.cloud /var/run/cloudstack-management.pid")
108121
#distro like sl 6.1 needs this folder, or tomcat6 failed to start
@@ -116,7 +129,10 @@ def checkHostName():
116129
cfo.save()
117130

118131
try:
119-
self.syscfg.svo.disableService("tomcat6")
132+
if self.syscfg.env.svrConf == "Tomcat7":
133+
self.syscfg.svo.disableService("tomcat")
134+
else:
135+
self.syscfg.svo.disableService("tomcat6")
120136
except:
121137
pass
122138

0 commit comments

Comments
0 (0)
You are visitor 01402520 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.