Skip to content

Commit 778a59f

Browse files
chiradeepchiradeep
committed
QuickCloud: move devcloud configuration into pom profile for exec:java
Also ignore agent.properties in RAT since a. they are trivial b. they are modified by the java code (stripping the license) QuickCloud: proper path for log.home QuickCloud: proper path for secstorage.sh
1 parent 5ff8bca commit 778a59f

7 files changed

Lines changed: 18 additions & 27 deletions

File tree

‎pom.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,10 @@
317317
<exclude>deps/XenServerJava/Makefile</exclude>
318318
<exclude>dist/console-proxy/js/jquery.js</exclude>
319319
<exclude>scripts/vm/systemvm/id_rsa.cloud</exclude>
320+
<exclude>services/console-proxy/server/conf/agent.properties</exclude>
321+
<exclude>services/console-proxy/server/conf/environment.properties</exclude>
322+
<exclude>services/secondary-storage/conf/agent.properties</exclude>
323+
<exclude>services/secondary-storage/conf/environment.properties</exclude>
320324
<exclude>tools/devcloud/basebuild/puppet-devcloudinitial/files/network.conf</exclude>
321325
<exclude>tools/appliance/definitions/devcloud/*</exclude>
322326
<exclude>tools/appliance/definitions/systemvmtemplate/*</exclude>

‎services/console-proxy/server/conf/agent.properties‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,2 @@
1-
# Licensed to the Apache Software Foundation (ASF) under one
2-
# or more contributor license agreements. See the NOTICE file
3-
# distributed with this work for additional information
4-
# regarding copyright ownership. The ASF licenses this file
5-
# to you under the Apache License, Version 2.0 (the
6-
# "License"); you may not use this file except in compliance
7-
# with the License. You may obtain a copy of the License at
8-
#
9-
# http://www.apache.org/licenses/LICENSE-2.0
10-
#
11-
# Unless required by applicable law or agreed to in writing,
12-
# software distributed under the License is distributed on an
13-
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14-
# KIND, either express or implied. See the License for the
15-
# specific language governing permissions and limitations
16-
# under the License.
17-
181
instance=ConsoleProxy
192
resource=com.cloud.agent.resource.consoleproxy.ConsoleProxyResource

‎services/console-proxy/server/pom.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,11 +280,14 @@
280280
<argument>zone=1</argument>
281281
<argument>pod=1</argument>
282282
<argument>host=192.168.56.1</argument>
283+
<argument>guid=ConsoleProxy.1</argument>
283284
</arguments>
284285
<systemProperties>
285286
<systemProperty>
286287
<key>javax.net.ssl.trustStore</key>
287288
<value>certs/realhostip.keystore</value>
289+
<key>log.home</key>
290+
<value>${PWD}/</value>
288291
</systemProperty>
289292
</systemProperties>
290293
</configuration>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@ do
2828
done
2929
keyvalues=
3030
#LOGHOME=/var/log/cloud/
31-
LOGHOME=$PWD
31+
LOGHOME=$PWD/
3232

3333
java -Djavax.net.ssl.trustStore=./certs/realhostip.keystore -Dlog.home=$LOGHOME -cp $CP com.cloud.agent.AgentShell $keyvalues $@

services/secondary-storage/scripts/secstorage.sh renamed to services/console-proxy/server/scripts/secstorage.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@ do
2828
done
2929
keyvalues=
3030
#LOGHOME=/var/log/cloud/
31-
LOGHOME=$PWD
31+
LOGHOME=$PWD/
3232

3333
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 & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,2 @@
1-
#mount.path=~/secondary-storage
2-
eth1ip=192.168.56.1
3-
name=192.168.56.10
4-
eth2ip=192.168.56.10
1+
#mount.path=~/secondary-storage/
52
resource=org.apache.cloudstack.storage.resource.NfsSecondaryStorageResource
6-
piddir=.
7-
instance=SecondaryStorage
8-
developer=true
9-
secondary.storage.vm=false

‎services/secondary-storage/pom.xml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,19 @@
8181
<argument>zone=1</argument>
8282
<argument>pod=1</argument>
8383
<argument>host=192.168.56.1</argument>
84+
<argument>name=192.168.56.10</argument>
85+
<argument>eth1ip=192.168.56.10</argument>
86+
<argument>eth2ip=192.168.56.10</argument>
87+
<argument>guid=SecondaryStorage.1</argument>
88+
<argument>secondary.storage.vm=false</argument>
89+
<argument>instance=Secondary</argument>
8490
</arguments>
8591
<systemProperties>
8692
<systemProperty>
8793
<key>javax.net.ssl.trustStore</key>
8894
<value>certs/realhostip.keystore</value>
95+
<key>log.home</key>
96+
<value>${PWD}/</value>
8997
</systemProperty>
9098
</systemProperties>
9199
</configuration>

0 commit comments

Comments
 (0)