Skip to content

Commit 936973a

Browse files
chiradeepchiradeep
committed
QuickCloud: launch scripts for secondary storage and console proxy outside system vm
QuickCloud: remove stuff added by the daemon
1 parent c5b11df commit 936973a

5 files changed

Lines changed: 71 additions & 5 deletions

File tree

‎services/console-proxy/server/scripts/_run.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ do
3535
CP=${CP}:$file
3636
done
3737
keyvalues=
38+
LOGHOME=/var/log/cloud/
3839

3940
CMDLINE=$(cat /var/cache/cloud/cmdline)
4041

@@ -60,4 +61,4 @@ then
6061
maxmem=$eightypcnt
6162
fi
6263

63-
java -Djavax.net.ssl.trustStore=./certs/realhostip.keystore -mx${maxmem}m -cp $CP com.cloud.agent.AgentShell $keyvalues $@
64+
java -Djavax.net.ssl.trustStore=./certs/realhostip.keystore -Dlog.home=$LOGHOME -mx${maxmem}m -cp $CP com.cloud.agent.AgentShell $keyvalues $@

‎services/console-proxy/server/scripts/consoleproxy.sh‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
#!/usr/bin/env bash
2+
# Licensed to the Apache Software Foundation (ASF) under one
3+
# or more contributor license agreements. See the NOTICE file
4+
# distributed with this work for additional information
5+
# regarding copyright ownership. The ASF licenses this file
6+
# to you under the Apache License, Version 2.0 (the
7+
# "License"); you may not use this file except in compliance
8+
# with the License. You may obtain a copy of the License at
9+
#
10+
# http://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing,
13+
# software distributed under the License is distributed on an
14+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
# KIND, either express or implied. See the License for the
16+
# specific language governing permissions and limitations
17+
# under the License.
18+
19+
20+
21+
#runs the console proxy as a standalone server
22+
#i.e., not in the system vm
23+
24+
CP=./:./conf
25+
for file in *.jar
26+
do
27+
CP=${CP}:$file
28+
done
29+
keyvalues=
30+
#LOGHOME=/var/log/cloud/
31+
LOGHOME=$PWD
32+
33+
java -Djavax.net.ssl.trustStore=./certs/realhostip.keystore -Dlog.home=$LOGHOME -cp $CP com.cloud.agent.AgentShell $keyvalues $@

‎services/secondary-storage/conf/agent.properties‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
#Storage
2-
#Sun Mar 24 22:52:35 PDT 2013
3-
mount.path=/Users/chiradeep/secondary-storage
1+
#mount.path=~/secondary-storage
42
eth1ip=192.168.56.1
53
name=192.168.56.10
64
eth2ip=192.168.56.10

‎services/secondary-storage/scripts/_run.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ do
3636
done
3737
keyvalues=
3838

39+
LOGHOME=/var/log/cloud/
3940
CMDLINE=$(cat /var/cache/cloud/cmdline)
4041

4142
#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
6061
maxmem=$eightypcnt
6162
fi
6263

63-
java -Djavax.net.ssl.trustStore=./certs/realhostip.keystore -mx${maxmem}m -cp $CP com.cloud.agent.AgentShell $keyvalues $@
64+
java -Djavax.net.ssl.trustStore=./certs/realhostip.keystore -Dlog.home=$LOGHOME -mx${maxmem}m -cp $CP com.cloud.agent.AgentShell $keyvalues $@

‎services/secondary-storage/scripts/secstorage.sh‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
#!/usr/bin/env bash
2+
# Licensed to the Apache Software Foundation (ASF) under one
3+
# or more contributor license agreements. See the NOTICE file
4+
# distributed with this work for additional information
5+
# regarding copyright ownership. The ASF licenses this file
6+
# to you under the Apache License, Version 2.0 (the
7+
# "License"); you may not use this file except in compliance
8+
# with the License. You may obtain a copy of the License at
9+
#
10+
# http://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing,
13+
# software distributed under the License is distributed on an
14+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
# KIND, either express or implied. See the License for the
16+
# specific language governing permissions and limitations
17+
# under the License.
18+
19+
20+
21+
#runs the secondary storage service as a standalone server
22+
#i.e., not in the system vm
23+
24+
CP=./:./conf
25+
for file in *.jar
26+
do
27+
CP=${CP}:$file
28+
done
29+
keyvalues=
30+
#LOGHOME=/var/log/cloud/
31+
LOGHOME=$PWD
32+
33+
java -Djavax.net.ssl.trustStore=./certs/realhostip.keystore -Dlog.home=$LOGHOME -cp $CP com.cloud.agent.AgentShell $keyvalues $@

0 commit comments

Comments
 (0)