From 778a59fbf6bc8957771718123079bd8a2707affa Mon Sep 17 00:00:00 2001 From: Chiradeep Vittal Date: Fri, 5 Apr 2013 14:25:44 -0700 Subject: [PATCH] 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 --- pom.xml | 4 ++++ .../console-proxy/server/conf/agent.properties | 17 ----------------- services/console-proxy/server/pom.xml | 3 +++ .../server/scripts/consoleproxy.sh | 2 +- .../server}/scripts/secstorage.sh | 2 +- .../secondary-storage/conf/agent.properties | 9 +-------- services/secondary-storage/pom.xml | 8 ++++++++ 7 files changed, 18 insertions(+), 27 deletions(-) rename services/{secondary-storage => console-proxy/server}/scripts/secstorage.sh (98%) diff --git a/pom.xml b/pom.xml index 62081241445..dbc39076f2d 100644 --- a/pom.xml +++ b/pom.xml @@ -317,6 +317,10 @@ deps/XenServerJava/Makefile dist/console-proxy/js/jquery.js scripts/vm/systemvm/id_rsa.cloud + services/console-proxy/server/conf/agent.properties + services/console-proxy/server/conf/environment.properties + services/secondary-storage/conf/agent.properties + services/secondary-storage/conf/environment.properties tools/devcloud/basebuild/puppet-devcloudinitial/files/network.conf tools/appliance/definitions/devcloud/* tools/appliance/definitions/systemvmtemplate/* diff --git a/services/console-proxy/server/conf/agent.properties b/services/console-proxy/server/conf/agent.properties index 4e217f21100..246cb1c3d08 100644 --- a/services/console-proxy/server/conf/agent.properties +++ b/services/console-proxy/server/conf/agent.properties @@ -1,19 +1,2 @@ -# 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. - instance=ConsoleProxy resource=com.cloud.agent.resource.consoleproxy.ConsoleProxyResource diff --git a/services/console-proxy/server/pom.xml b/services/console-proxy/server/pom.xml index 3d149a5c724..3ac5d5957f7 100644 --- a/services/console-proxy/server/pom.xml +++ b/services/console-proxy/server/pom.xml @@ -280,11 +280,14 @@ zone=1 pod=1 host=192.168.56.1 + guid=ConsoleProxy.1 javax.net.ssl.trustStore certs/realhostip.keystore + log.home + ${PWD}/ diff --git a/services/console-proxy/server/scripts/consoleproxy.sh b/services/console-proxy/server/scripts/consoleproxy.sh index 4a6acdee299..294d5974bb5 100755 --- a/services/console-proxy/server/scripts/consoleproxy.sh +++ b/services/console-proxy/server/scripts/consoleproxy.sh @@ -28,6 +28,6 @@ do done keyvalues= #LOGHOME=/var/log/cloud/ -LOGHOME=$PWD +LOGHOME=$PWD/ java -Djavax.net.ssl.trustStore=./certs/realhostip.keystore -Dlog.home=$LOGHOME -cp $CP com.cloud.agent.AgentShell $keyvalues $@ diff --git a/services/secondary-storage/scripts/secstorage.sh b/services/console-proxy/server/scripts/secstorage.sh similarity index 98% rename from services/secondary-storage/scripts/secstorage.sh rename to services/console-proxy/server/scripts/secstorage.sh index 9afc5215dee..b45afc2e8ca 100755 --- a/services/secondary-storage/scripts/secstorage.sh +++ b/services/console-proxy/server/scripts/secstorage.sh @@ -28,6 +28,6 @@ do done keyvalues= #LOGHOME=/var/log/cloud/ -LOGHOME=$PWD +LOGHOME=$PWD/ java -Djavax.net.ssl.trustStore=./certs/realhostip.keystore -Dlog.home=$LOGHOME -cp $CP com.cloud.agent.AgentShell $keyvalues $@ diff --git a/services/secondary-storage/conf/agent.properties b/services/secondary-storage/conf/agent.properties index 554007f90af..aab82b63374 100644 --- a/services/secondary-storage/conf/agent.properties +++ b/services/secondary-storage/conf/agent.properties @@ -1,9 +1,2 @@ -#mount.path=~/secondary-storage -eth1ip=192.168.56.1 -name=192.168.56.10 -eth2ip=192.168.56.10 +#mount.path=~/secondary-storage/ resource=org.apache.cloudstack.storage.resource.NfsSecondaryStorageResource -piddir=. -instance=SecondaryStorage -developer=true -secondary.storage.vm=false diff --git a/services/secondary-storage/pom.xml b/services/secondary-storage/pom.xml index 05770848987..2c8a1d0b9b8 100644 --- a/services/secondary-storage/pom.xml +++ b/services/secondary-storage/pom.xml @@ -81,11 +81,19 @@ zone=1 pod=1 host=192.168.56.1 + name=192.168.56.10 + eth1ip=192.168.56.10 + eth2ip=192.168.56.10 + guid=SecondaryStorage.1 + secondary.storage.vm=false + instance=Secondary javax.net.ssl.trustStore certs/realhostip.keystore + log.home + ${PWD}/