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 Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c6159408 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c6159408 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c6159408 Branch: refs/heads/quickcloud2 Commit: c615940897dd131aa403fd78d9adc3b2b7772956 Parents: 6cbae9f Author: Chiradeep Vittal <chirad...@apache.org> Authored: Fri Apr 5 14:25:44 2013 -0700 Committer: Chiradeep Vittal <chirad...@apache.org> Committed: Fri Apr 5 15:12:17 2013 -0700 ---------------------------------------------------------------------- pom.xml | 4 ++ .../console-proxy/server/conf/agent.properties | 17 -------- services/console-proxy/server/pom.xml | 3 + .../console-proxy/server/scripts/consoleproxy.sh | 2 +- .../console-proxy/server/scripts/secstorage.sh | 33 +++++++++++++++ services/secondary-storage/conf/agent.properties | 9 +---- services/secondary-storage/pom.xml | 8 ++++ services/secondary-storage/scripts/secstorage.sh | 33 --------------- 8 files changed, 50 insertions(+), 59 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c6159408/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 6208124..dbc3907 100644 --- a/pom.xml +++ b/pom.xml @@ -317,6 +317,10 @@ <exclude>deps/XenServerJava/Makefile</exclude> <exclude>dist/console-proxy/js/jquery.js</exclude> <exclude>scripts/vm/systemvm/id_rsa.cloud</exclude> + <exclude>services/console-proxy/server/conf/agent.properties</exclude> + <exclude>services/console-proxy/server/conf/environment.properties</exclude> + <exclude>services/secondary-storage/conf/agent.properties</exclude> + <exclude>services/secondary-storage/conf/environment.properties</exclude> <exclude>tools/devcloud/basebuild/puppet-devcloudinitial/files/network.conf</exclude> <exclude>tools/appliance/definitions/devcloud/*</exclude> <exclude>tools/appliance/definitions/systemvmtemplate/*</exclude> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c6159408/services/console-proxy/server/conf/agent.properties ---------------------------------------------------------------------- diff --git a/services/console-proxy/server/conf/agent.properties b/services/console-proxy/server/conf/agent.properties index 4e217f2..246cb1c 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 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c6159408/services/console-proxy/server/pom.xml ---------------------------------------------------------------------- diff --git a/services/console-proxy/server/pom.xml b/services/console-proxy/server/pom.xml index 3d149a5..3ac5d59 100644 --- a/services/console-proxy/server/pom.xml +++ b/services/console-proxy/server/pom.xml @@ -280,11 +280,14 @@ <argument>zone=1</argument> <argument>pod=1</argument> <argument>host=192.168.56.1</argument> + <argument>guid=ConsoleProxy.1</argument> </arguments> <systemProperties> <systemProperty> <key>javax.net.ssl.trustStore</key> <value>certs/realhostip.keystore</value> + <key>log.home</key> + <value>${PWD}/</value> </systemProperty> </systemProperties> </configuration> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c6159408/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 index 4a6acde..294d597 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 $@ http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c6159408/services/console-proxy/server/scripts/secstorage.sh ---------------------------------------------------------------------- diff --git a/services/console-proxy/server/scripts/secstorage.sh b/services/console-proxy/server/scripts/secstorage.sh new file mode 100755 index 0000000..b45afc2 --- /dev/null +++ b/services/console-proxy/server/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 $@ http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c6159408/services/secondary-storage/conf/agent.properties ---------------------------------------------------------------------- diff --git a/services/secondary-storage/conf/agent.properties b/services/secondary-storage/conf/agent.properties index 554007f..aab82b6 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 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c6159408/services/secondary-storage/pom.xml ---------------------------------------------------------------------- diff --git a/services/secondary-storage/pom.xml b/services/secondary-storage/pom.xml index 0577084..2c8a1d0 100644 --- a/services/secondary-storage/pom.xml +++ b/services/secondary-storage/pom.xml @@ -81,11 +81,19 @@ <argument>zone=1</argument> <argument>pod=1</argument> <argument>host=192.168.56.1</argument> + <argument>name=192.168.56.10</argument> + <argument>eth1ip=192.168.56.10</argument> + <argument>eth2ip=192.168.56.10</argument> + <argument>guid=SecondaryStorage.1</argument> + <argument>secondary.storage.vm=false</argument> + <argument>instance=Secondary</argument> </arguments> <systemProperties> <systemProperty> <key>javax.net.ssl.trustStore</key> <value>certs/realhostip.keystore</value> + <key>log.home</key> + <value>${PWD}/</value> </systemProperty> </systemProperties> </configuration> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c6159408/services/secondary-storage/scripts/secstorage.sh ---------------------------------------------------------------------- diff --git a/services/secondary-storage/scripts/secstorage.sh b/services/secondary-storage/scripts/secstorage.sh deleted file mode 100755 index 9afc521..0000000 --- a/services/secondary-storage/scripts/secstorage.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/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 $@
