GeezerVison

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

GeezerVison is showing github.com — Summary: changed the path from cloud to cloudstack. · Skotha/cloudstack@a9955f1

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

packaging/centos63
- package.sh
python/lib/cloudutils
- serviceConfig.py
- serviceConfigServer.py

Expand file treeCollapse file tree

Open diff view settings

Collapse file

`‎packaging/centos63/package.sh‎`

Copy file name to clipboardExpand all lines: packaging/centos63/package.sh

+3-3Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -34,11 +34,11 @@ else`
`34`	`34`	`fi`
`35`	`35`
`36`	`36`	`mkdir -p $RPMDIR/SPECS`
`37`		`-mkdir -p $RPMDIR/SOURCES/cloud-$VERSION`
	`37`	`+mkdir -p $RPMDIR/SOURCES/cloudstack-$VERSION`
`38`	`38`
`39`	`39`
`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)`
`42`	`42`
`43`	`43`	`cp cloud.spec $RPMDIR/SPECS`
`44`	`44`

Collapse file

`‎python/lib/cloudutils/serviceConfig.py‎`

Copy file name to clipboardExpand all lines: python/lib/cloudutils/serviceConfig.py

+11-11Lines changed: 11 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -54,9 +54,9 @@ def configration(self):`
`54`	`54`	`except:`
`55`	`55`	`logging.debug(formatExceptionInfo())`
`56`	`56`	`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)`
`58`	`58`	`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)`
`60`	`60`
`61`	`61`	`def backup(self):`
`62`	`62`	`if self.status is None:`
`@@ -386,7 +386,7 @@ def config(self):`
`386`	`386`
`387`	`387`	`return True`
`388`	`388`	`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, \`
`390`	`390`	`or you can manually disable it before starting myCloud")`
`391`	`391`
`392`	`392`	`def restore(self):`
`@@ -416,7 +416,7 @@ def config(self):`
`416`	`416`	`cfo.replace_line("SELINUX=", "SELINUX=permissive")`
`417`	`417`	`return True`
`418`	`418`	`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, \`
`420`	`420`	`or you can manually disable it before starting myCloud")`
`421`	`421`	`else:`
`422`	`422`	`return True`
`@@ -602,7 +602,7 @@ def __init__(self, syscfg):`
`602`	`602`
`603`	`603`	`def configMyCloud(self):`
`604`	`604`	`try:`
`605`		`- cfo = configFileOps("/etc/cloud/agent/agent.properties", self)`
	`605`	`+ cfo = configFileOps("/etc/cloudstack/agent/agent.properties", self)`
`606`	`606`	`cfo.addEntry("host", self.syscfg.env.mgtSvr)`
`607`	`607`	`cfo.addEntry("zone", self.syscfg.env.zone)`
`608`	`608`	`cfo.addEntry("port", "443")`
`@@ -624,7 +624,7 @@ def configMyCloud(self):`
`624`	`624`
`625`	`625`	`def configAgent(self):`
`626`	`626`	`try:`
`627`		`- cfo = configFileOps("/etc/cloud/agent/agent.properties", self)`
	`627`	`+ cfo = configFileOps("/etc/cloudstack/agent/agent.properties", self)`
`628`	`628`	`cfo.addEntry("host", self.syscfg.env.mgtSvr)`
`629`	`629`	`cfo.addEntry("zone", self.syscfg.env.zone)`
`630`	`630`	`cfo.addEntry("pod", self.syscfg.env.pod)`
`@@ -639,16 +639,16 @@ def configAgent(self):`
`639`	`639`	`cfo.addEntry("resource", "com.cloud.hypervisor.kvm.resource.LibvirtComputingResource")`
`640`	`640`	`cfo.save()`
`641`	`641`
`642`		`- self.syscfg.svo.stopService("cloud-agent")`
	`642`	`+ self.syscfg.svo.stopService("cloudstack-agent")`
`643`	`643`	`bash("sleep 30")`
`644`		`- self.syscfg.svo.enableService("cloud-agent")`
	`644`	`+ self.syscfg.svo.enableService("cloudstack-agent")`
`645`	`645`	`return True`
`646`	`646`	`except:`
`647`	`647`	`raise`
`648`	`648`
`649`	`649`	`def configConsole(self):`
`650`	`650`	`try:`
`651`		`- cfo = configFileOps("/etc/cloud/agent/agent.properties", self)`
	`651`	`+ cfo = configFileOps("/etc/cloudstack/agent/agent.properties", self)`
`652`	`652`	`cfo.addEntry("host", self.syscfg.env.mgtSvr)`
`653`	`653`	`cfo.addEntry("zone", self.syscfg.env.zone)`
`654`	`654`	`cfo.addEntry("pod", self.syscfg.env.pod)`
`@@ -661,8 +661,8 @@ def configConsole(self):`
`661`	`661`	`cfo.addEntry("resource", "com.cloud.agent.resource.computing.consoleProxyResource")`
`662`	`662`	`cfo.save()`
`663`	`663`
`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")`
`666`	`666`	`return True`
`667`	`667`	`except:`
`668`	`668`	`raise`

Collapse file

`‎python/lib/cloudutils/serviceConfigServer.py‎`

Copy file name to clipboardExpand all lines: python/lib/cloudutils/serviceConfigServer.py

+21-22Lines changed: 21 additions & 22 deletions

Original file line number	Diff line number	Diff line change
`@@ -80,32 +80,32 @@ def checkHostName():`
`80`	`80`	`if not cmd.isSuccess():`
`81`	`81`	`raise CloudInternalException(cmd.getErrMsg())`
`82`	`82`
`83`		`- cfo = configFileOps("/etc/cloud/management/tomcat6.conf", self)`
	`83`	`+ cfo = configFileOps("/etc/cloudstack/management/tomcat6.conf", self)`
`84`	`84`	`cfo.add_lines("JAVA_OPTS+=\" -Djavax.net.ssl.trustStore=%s \""%keyPath)`
`85`	`85`	`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")`
`94`	`94`	`if not bash("iptables-save \|grep PREROUTING \| grep 6443").isSuccess():`
`95`	`95`	`bash("iptables -A PREROUTING -t nat -p tcp --dport 443 -j REDIRECT --to-port 6443")`
`96`	`96`	`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")`
`105`	`105`
`106`	`106`	`#distro like sl 6.1 needs this folder, or tomcat6 failed to start`
`107`	`107`	`checkHostName()`
`108`		`- bash("mkdir /var/log/cloud-management/")`
	`108`	`+ bash("mkdir /var/log/cloudstack-management/")`
`109`	`109`	`#set max process per account is unlimited`
`110`	`110`	`if os.path.exists("/etc/security/limits.conf"):`
`111`	`111`	`cfo = configFileOps("/etc/security/limits.conf")`
`@@ -118,9 +118,8 @@ def checkHostName():`
`118`	`118`	`except:`
`119`	`119`	`pass`
`120`	`120`
`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"):`
`123`	`123`	`return True`
`124`	`124`	`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 (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.