Skip to content

Commit a9955f1

Browse files
Pradeep Soundararajanspark404
Pradeep Soundararajan
authored and
spark404
committed
Summary: changed the path from cloud to cloudstack.
The change in package script allowed us to create proper tar under rpmbuild/SOURCES directory The change in the path enabled us to launch the management server properly. Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com> Committed-by: Hugo Trippaers <htrippaers@schubergphilis.com>
1 parent db3b0d3 commit a9955f1

3 files changed

Lines changed: 35 additions & 36 deletions

File tree

‎packaging/centos63/package.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ else
3434
fi
3535

3636
mkdir -p $RPMDIR/SPECS
37-
mkdir -p $RPMDIR/SOURCES/cloud-$VERSION
37+
mkdir -p $RPMDIR/SOURCES/cloudstack-$VERSION
3838

3939

40-
(cd ../../; tar -c --exclude .git --exclude dist . | tar -C $RPMDIR/SOURCES/cloud-$VERSION -x )
41-
(cd $RPMDIR/SOURCES/; tar -czf cloud-$VERSION.tgz cloud-$VERSION)
40+
(cd ../../; tar -c --exclude .git --exclude dist . | tar -C $RPMDIR/SOURCES/cloudstack-$VERSION -x )
41+
(cd $RPMDIR/SOURCES/; tar -czf cloudstack-$VERSION.tgz cloudstack-$VERSION)
4242

4343
cp cloud.spec $RPMDIR/SPECS
4444

‎python/lib/cloudutils/serviceConfig.py‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ def configration(self):
5454
except:
5555
logging.debug(formatExceptionInfo())
5656
if self.syscfg.env.mode == "Server":
57-
raise CloudRuntimeException("Configure %s failed, Please check the /var/log/cloud/setupManagement.log for detail"%self.serviceName)
57+
raise CloudRuntimeException("Configure %s failed, Please check the /var/log/cloudstack/setupManagement.log for detail"%self.serviceName)
5858
else:
59-
raise CloudRuntimeException("Configure %s failed, Please check the /var/log/cloud/setupAgent.log for detail"%self.serviceName)
59+
raise CloudRuntimeException("Configure %s failed, Please check the /var/log/cloudstack/setupAgent.log for detail"%self.serviceName)
6060

6161
def backup(self):
6262
if self.status is None:
@@ -386,7 +386,7 @@ def config(self):
386386

387387
return True
388388
except:
389-
raise CloudRuntimeException("Failed to configure apparmor, please see the /var/log/cloud/setupAgent.log for detail, \
389+
raise CloudRuntimeException("Failed to configure apparmor, please see the /var/log/cloudstack/setupAgent.log for detail, \
390390
or you can manually disable it before starting myCloud")
391391

392392
def restore(self):
@@ -416,7 +416,7 @@ def config(self):
416416
cfo.replace_line("SELINUX=", "SELINUX=permissive")
417417
return True
418418
except:
419-
raise CloudRuntimeException("Failed to configure selinux, please see the /var/log/cloud/setupAgent.log for detail, \
419+
raise CloudRuntimeException("Failed to configure selinux, please see the /var/log/cloudstack/setupAgent.log for detail, \
420420
or you can manually disable it before starting myCloud")
421421
else:
422422
return True
@@ -602,7 +602,7 @@ def __init__(self, syscfg):
602602

603603
def configMyCloud(self):
604604
try:
605-
cfo = configFileOps("/etc/cloud/agent/agent.properties", self)
605+
cfo = configFileOps("/etc/cloudstack/agent/agent.properties", self)
606606
cfo.addEntry("host", self.syscfg.env.mgtSvr)
607607
cfo.addEntry("zone", self.syscfg.env.zone)
608608
cfo.addEntry("port", "443")
@@ -624,7 +624,7 @@ def configMyCloud(self):
624624

625625
def configAgent(self):
626626
try:
627-
cfo = configFileOps("/etc/cloud/agent/agent.properties", self)
627+
cfo = configFileOps("/etc/cloudstack/agent/agent.properties", self)
628628
cfo.addEntry("host", self.syscfg.env.mgtSvr)
629629
cfo.addEntry("zone", self.syscfg.env.zone)
630630
cfo.addEntry("pod", self.syscfg.env.pod)
@@ -639,16 +639,16 @@ def configAgent(self):
639639
cfo.addEntry("resource", "com.cloud.hypervisor.kvm.resource.LibvirtComputingResource")
640640
cfo.save()
641641

642-
self.syscfg.svo.stopService("cloud-agent")
642+
self.syscfg.svo.stopService("cloudstack-agent")
643643
bash("sleep 30")
644-
self.syscfg.svo.enableService("cloud-agent")
644+
self.syscfg.svo.enableService("cloudstack-agent")
645645
return True
646646
except:
647647
raise
648648

649649
def configConsole(self):
650650
try:
651-
cfo = configFileOps("/etc/cloud/agent/agent.properties", self)
651+
cfo = configFileOps("/etc/cloudstack/agent/agent.properties", self)
652652
cfo.addEntry("host", self.syscfg.env.mgtSvr)
653653
cfo.addEntry("zone", self.syscfg.env.zone)
654654
cfo.addEntry("pod", self.syscfg.env.pod)
@@ -661,8 +661,8 @@ def configConsole(self):
661661
cfo.addEntry("resource", "com.cloud.agent.resource.computing.consoleProxyResource")
662662
cfo.save()
663663

664-
self.syscfg.svo.stopService("cloud-agent")
665-
self.syscfg.svo.enableService("cloud-agent")
664+
self.syscfg.svo.stopService("cloudstack-agent")
665+
self.syscfg.svo.enableService("cloudstack-agent")
666666
return True
667667
except:
668668
raise

‎python/lib/cloudutils/serviceConfigServer.py‎

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -80,32 +80,32 @@ def checkHostName():
8080
if not cmd.isSuccess():
8181
raise CloudInternalException(cmd.getErrMsg())
8282

83-
cfo = configFileOps("/etc/cloud/management/tomcat6.conf", self)
83+
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/cloud/management/server-ssl.xml") or not os.path.exists("/etc/cloud/management/tomcat6-ssl.conf"):
87-
raise CloudRuntimeException("Cannot find /etc/cloud/management/server-ssl.xml or /etc/cloud/management/tomcat6-ssl.conf, https enables failed")
88-
if os.path.exists("/etc/cloud/management/server.xml"):
89-
bash("rm -f /etc/cloud/management/server.xml")
90-
if os.path.exists("/etc/cloud/management/tomcat6.conf"):
91-
bash("rm -f /etc/cloud/management/tomcat6.conf")
92-
bash("ln -s /etc/cloud/management/server-ssl.xml /etc/cloud/management/server.xml")
93-
bash("ln -s /etc/cloud/management/tomcat6-ssl.conf /etc/cloud/management/tomcat6.conf")
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")
9494
if not bash("iptables-save |grep PREROUTING | grep 6443").isSuccess():
9595
bash("iptables -A PREROUTING -t nat -p tcp --dport 443 -j REDIRECT --to-port 6443")
9696
else:
97-
if not os.path.exists("/etc/cloud/management/server-nonssl.xml") or not os.path.exists("/etc/cloud/management/tomcat6-nonssl.conf"):
98-
raise CloudRuntimeException("Cannot find /etc/cloud/management/server-nonssl.xml or /etc/cloud/management/tomcat6-nonssl.conf, https enables failed")
99-
if os.path.exists("/etc/cloud/management/server.xml"):
100-
bash("rm -f /etc/cloud/management/server.xml")
101-
if os.path.exists("/etc/cloud/management/tomcat6.conf"):
102-
bash("rm -f /etc/cloud/management/tomcat6.conf")
103-
bash("ln -s /etc/cloud/management/server-nonssl.xml /etc/cloud/management/server.xml")
104-
bash("ln -s /etc/cloud/management/tomcat6-nonssl.conf /etc/cloud/management/tomcat6.conf")
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")
105105

106106
#distro like sl 6.1 needs this folder, or tomcat6 failed to start
107107
checkHostName()
108-
bash("mkdir /var/log/cloud-management/")
108+
bash("mkdir /var/log/cloudstack-management/")
109109
#set max process per account is unlimited
110110
if os.path.exists("/etc/security/limits.conf"):
111111
cfo = configFileOps("/etc/security/limits.conf")
@@ -118,9 +118,8 @@ def checkHostName():
118118
except:
119119
pass
120120

121-
self.syscfg.svo.stopService("cloud-management")
122-
if self.syscfg.svo.enableService("cloud-management"):
121+
self.syscfg.svo.stopService("cloudstack-management")
122+
if self.syscfg.svo.enableService("cloudstack-management"):
123123
return True
124124
else:
125-
raise CloudRuntimeException("Failed to configure %s, please see the /var/log/cloud/setupManagement.log for detail"%self.serviceName)
126-
125+
raise CloudRuntimeException("Failed to configure %s, please see the /var/log/cloudstack/setupManagement.log for detail"%self.serviceName)

0 commit comments

Comments
 (0)