QuickCloud: launch scripts for secondary storage and console proxy outside system vm
QuickCloud: remove stuff added by the daemon Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/17f286c6 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/17f286c6 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/17f286c6 Branch: refs/heads/quickcloud2 Commit: 17f286c62da63ea349978ed365ea1c3b4cac59f3 Parents: 37b73f7 Author: Chiradeep Vittal <chirad...@apache.org> Authored: Wed Mar 27 16:49:56 2013 -0700 Committer: Chiradeep Vittal <chirad...@apache.org> Committed: Fri Apr 5 15:12:17 2013 -0700 ---------------------------------------------------------------------- services/console-proxy/server/scripts/_run.sh | 3 +- .../console-proxy/server/scripts/consoleproxy.sh | 33 +++++++++++++++ services/secondary-storage/conf/agent.properties | 4 +- services/secondary-storage/scripts/_run.sh | 3 +- services/secondary-storage/scripts/secstorage.sh | 33 +++++++++++++++ 5 files changed, 71 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/17f286c6/services/console-proxy/server/scripts/_run.sh ---------------------------------------------------------------------- diff --git a/services/console-proxy/server/scripts/_run.sh b/services/console-proxy/server/scripts/_run.sh index e408378..bd06346 100755 --- a/services/console-proxy/server/scripts/_run.sh +++ b/services/console-proxy/server/scripts/_run.sh @@ -35,6 +35,7 @@ do CP=${CP}:$file done keyvalues= +LOGHOME=/var/log/cloud/ CMDLINE=$(cat /var/cache/cloud/cmdline) @@ -60,4 +61,4 @@ then maxmem=$eightypcnt fi -java -Djavax.net.ssl.trustStore=./certs/realhostip.keystore -mx${maxmem}m -cp $CP com.cloud.agent.AgentShell $keyvalues $@ +java -Djavax.net.ssl.trustStore=./certs/realhostip.keystore -Dlog.home=$LOGHOME -mx${maxmem}m -cp $CP com.cloud.agent.AgentShell $keyvalues $@ http://git-wip-us.apache.org/repos/asf/cloudstack/blob/17f286c6/services/console-proxy/server/scripts/consoleproxy.sh ---------------------------------------------------------------------- diff --git a/services/console-proxy/server/scripts/consoleproxy.sh b/services/console-proxy/server/scripts/consoleproxy.sh new file mode 100755 index 0000000..4a6acde --- /dev/null +++ b/services/console-proxy/server/scripts/consoleproxy.sh @@ -0,0 +1,33 @@ +#!/usr/bin/env bash +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# 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 +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + + + +#runs the console proxy as a standalone server +#i.e., not in the system vm + +CP=./:./conf +for file in *.jar +do + CP=${CP}:$file +done +keyvalues= +#LOGHOME=/var/log/cloud/ +LOGHOME=$PWD + +java -Djavax.net.ssl.trustStore=./certs/realhostip.keystore -Dlog.home=$LOGHOME -cp $CP com.cloud.agent.AgentShell $keyvalues $@ http://git-wip-us.apache.org/repos/asf/cloudstack/blob/17f286c6/services/secondary-storage/conf/agent.properties ---------------------------------------------------------------------- diff --git a/services/secondary-storage/conf/agent.properties b/services/secondary-storage/conf/agent.properties index 4a25cbd..554007f 100644 --- a/services/secondary-storage/conf/agent.properties +++ b/services/secondary-storage/conf/agent.properties @@ -1,6 +1,4 @@ -#Storage -#Sun Mar 24 22:52:35 PDT 2013 -mount.path=/Users/chiradeep/secondary-storage +#mount.path=~/secondary-storage eth1ip=192.168.56.1 name=192.168.56.10 eth2ip=192.168.56.10 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/17f286c6/services/secondary-storage/scripts/_run.sh ---------------------------------------------------------------------- diff --git a/services/secondary-storage/scripts/_run.sh b/services/secondary-storage/scripts/_run.sh index e408378..cb9624c 100755 --- a/services/secondary-storage/scripts/_run.sh +++ b/services/secondary-storage/scripts/_run.sh @@ -36,6 +36,7 @@ do done keyvalues= +LOGHOME=/var/log/cloud/ CMDLINE=$(cat /var/cache/cloud/cmdline) #CMDLINE="graphical utf8 eth0ip=0.0.0.0 eth0mask=255.255.255.0 eth1ip=192.168.140.40 eth1mask=255.255.255.0 eth2ip=172.24.0.50 eth2mask=255.255.0.0 gateway=172.24.0.1 dns1=72.52.126.11 template=domP dns2=72.52.126.12 host=192.168.1.142 port=8250 mgmtcidr=192.168.1.0/24 localgw=192.168.140.1 zone=5 pod=5" @@ -60,4 +61,4 @@ then maxmem=$eightypcnt fi -java -Djavax.net.ssl.trustStore=./certs/realhostip.keystore -mx${maxmem}m -cp $CP com.cloud.agent.AgentShell $keyvalues $@ +java -Djavax.net.ssl.trustStore=./certs/realhostip.keystore -Dlog.home=$LOGHOME -mx${maxmem}m -cp $CP com.cloud.agent.AgentShell $keyvalues $@ http://git-wip-us.apache.org/repos/asf/cloudstack/blob/17f286c6/services/secondary-storage/scripts/secstorage.sh ---------------------------------------------------------------------- diff --git a/services/secondary-storage/scripts/secstorage.sh b/services/secondary-storage/scripts/secstorage.sh new file mode 100755 index 0000000..9afc521 --- /dev/null +++ b/services/secondary-storage/scripts/secstorage.sh @@ -0,0 +1,33 @@ +#!/usr/bin/env bash +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# 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 +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + + + +#runs the secondary storage service as a standalone server +#i.e., not in the system vm + +CP=./:./conf +for file in *.jar +do + CP=${CP}:$file +done +keyvalues= +#LOGHOME=/var/log/cloud/ +LOGHOME=$PWD + +java -Djavax.net.ssl.trustStore=./certs/realhostip.keystore -Dlog.home=$LOGHOME -cp $CP com.cloud.agent.AgentShell $keyvalues $@
