Remove duplicate scripts and move the remaining items to the systemvm project
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/71dc43eb Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/71dc43eb Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/71dc43eb Branch: refs/heads/pluggable_vm_snapshot Commit: 71dc43ebb01ec0cbf21f3f37eeb7e378a033d69b Parents: 87c1b35 Author: Hugo Trippaers <htrippa...@schubergphilis.com> Authored: Fri Oct 11 09:55:13 2013 +0100 Committer: Hugo Trippaers <htrippa...@schubergphilis.com> Committed: Mon Oct 14 08:02:35 2013 +0200 ---------------------------------------------------------------------- .../secondary-storage/conf/agent.properties | 4 - .../conf/environment.properties | 2 - services/secondary-storage/conf/log4j-cloud.xml | 102 ----------- services/secondary-storage/conf/log4j.xml | 102 ----------- services/secondary-storage/scripts/_run.sh | 64 ------- .../secondary-storage/scripts/config_auth.sh | 69 ------- .../secondary-storage/scripts/config_ssl.sh | 183 ------------------- .../secondary-storage/scripts/ipfirewall.sh | 50 ----- services/secondary-storage/scripts/run-proxy.sh | 48 ----- services/secondary-storage/scripts/run.bat | 18 -- services/secondary-storage/scripts/run.sh | 45 ----- .../secondary-storage/scripts/ssvm-check.sh | 136 -------------- systemvm/conf/agent.properties.ssvm | 4 + systemvm/scripts/ssvm-check.sh | 136 ++++++++++++++ systemvm/systemvm-descriptor.xml | 9 - 15 files changed, 140 insertions(+), 832 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/71dc43eb/services/secondary-storage/conf/agent.properties ---------------------------------------------------------------------- diff --git a/services/secondary-storage/conf/agent.properties b/services/secondary-storage/conf/agent.properties deleted file mode 100644 index 507ea4d..0000000 --- a/services/secondary-storage/conf/agent.properties +++ /dev/null @@ -1,4 +0,0 @@ -#mount.path=~/secondary-storage/ -resource=org.apache.cloudstack.storage.resource.NfsSecondaryStorageResource -testCifsMount=cifs://192.168.1.1/CSHV3?user=administrator&password=1pass%40word1 -#testLocalRoot=test http://git-wip-us.apache.org/repos/asf/cloudstack/blob/71dc43eb/services/secondary-storage/conf/environment.properties ---------------------------------------------------------------------- diff --git a/services/secondary-storage/conf/environment.properties b/services/secondary-storage/conf/environment.properties deleted file mode 100644 index 269acad..0000000 --- a/services/secondary-storage/conf/environment.properties +++ /dev/null @@ -1,2 +0,0 @@ -paths.script=../../scripts/storage/secondary/ -paths.pid=. http://git-wip-us.apache.org/repos/asf/cloudstack/blob/71dc43eb/services/secondary-storage/conf/log4j-cloud.xml ---------------------------------------------------------------------- diff --git a/services/secondary-storage/conf/log4j-cloud.xml b/services/secondary-storage/conf/log4j-cloud.xml deleted file mode 100644 index 7d9d22c..0000000 --- a/services/secondary-storage/conf/log4j-cloud.xml +++ /dev/null @@ -1,102 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -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. ---> -<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> - -<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"; debug="false"> - - <!-- ================================= --> - <!-- Preserve messages in a local file --> - <!-- ================================= --> - - <!-- A time/date based rolling appender --> - <appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender"> - <param name="File" value="${ss.log.home}systemvm.log"/> - <param name="Append" value="true"/> - <param name="Threshold" value="DEBUG"/> - - <!-- Rollover at midnight each day --> - <param name="DatePattern" value="'.'yyyy-MM-dd"/> - - <layout class="org.apache.log4j.PatternLayout"> - <param name="ConversionPattern" value="%d %-5p [%c{3}] (%t:%x) %m%n"/> - </layout> - </appender> - - <!-- ============================== --> - <!-- Append messages to the console --> - <!-- ============================== --> - - <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> - <param name="Target" value="System.out"/> - <param name="Threshold" value="WARN"/> - - <layout class="org.apache.log4j.PatternLayout"> - <param name="ConversionPattern" value="%d{ABSOLUTE} %5p %c{1}:%L - %m%n"/> - </layout> - </appender> - - <!-- ================ --> - <!-- Limit categories --> - <!-- ================ --> - - <category name="com.cloud.console.ConsoleCanvas"> - <priority value="WARN"/> - </category> - - <category name="com.cloud.consoleproxy.ConsoleProxyAjaxImageHandler"> - <priority value="WARN"/> - </category> - - <category name="com.cloud.consoleproxy.ConsoleProxyViewer"> - <priority value="WARN"/> - </category> - - <category name="com.cloud.consoleproxy"> - <priority value="INFO"/> - </category> - - <category name="com.cloud"> - <priority value="DEBUG"/> - </category> - - <!-- Limit the org.apache category to INFO as its DEBUG is verbose --> - <category name="org.apache"> - <priority value="DEBUG"/> - </category> - - <category name="org"> - <priority value="INFO"/> - </category> - - <category name="net"> - <priority value="INFO"/> - </category> - - <!-- ======================= --> - <!-- Setup the Root category --> - <!-- ======================= --> - - <root> - <level value="DEBUG"/> - <appender-ref ref="CONSOLE"/> - <appender-ref ref="FILE"/> - </root> - -</log4j:configuration> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/71dc43eb/services/secondary-storage/conf/log4j.xml ---------------------------------------------------------------------- diff --git a/services/secondary-storage/conf/log4j.xml b/services/secondary-storage/conf/log4j.xml deleted file mode 100644 index 9511f30..0000000 --- a/services/secondary-storage/conf/log4j.xml +++ /dev/null @@ -1,102 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -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. ---> -<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> - -<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"; debug="false"> - - <!-- ================================= --> - <!-- Preserve messages in a local file --> - <!-- ================================= --> - - <!-- A time/date based rolling appender --> - <appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender"> - <param name="File" value="${ss.log.home}systemvm.log"/> - <param name="Append" value="true"/> - <param name="Threshold" value="DEBUG"/> - - <!-- Rollover at midnight each day --> - <param name="DatePattern" value="'.'yyyy-MM-dd"/> - - <layout class="org.apache.log4j.PatternLayout"> - <param name="ConversionPattern" value="%d %-5p [%c{3}] (%t:%x) %m%n"/> - </layout> - </appender> - - <!-- ============================== --> - <!-- Append messages to the console --> - <!-- ============================== --> - - <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> - <param name="Target" value="System.out"/> - <param name="Threshold" value="DEBUG"/> - - <layout class="org.apache.log4j.PatternLayout"> - <param name="ConversionPattern" value="%d{ABSOLUTE} %5p %c{1}:%L - %m%n"/> - </layout> - </appender> - - <!-- ================ --> - <!-- Limit categories --> - <!-- ================ --> - - <category name="com.cloud.console.ConsoleCanvas"> - <priority value="WARN"/> - </category> - - <category name="com.cloud.consoleproxy.ConsoleProxyAjaxImageHandler"> - <priority value="WARN"/> - </category> - - <category name="com.cloud.consoleproxy.ConsoleProxyViewer"> - <priority value="WARN"/> - </category> - - <category name="com.cloud.consoleproxy"> - <priority value="INFO"/> - </category> - - <category name="com.cloud"> - <priority value="DEBUG"/> - </category> - - <!-- Limit the org.apache category to INFO as its DEBUG is verbose --> - <category name="org.apache"> - <priority value="DEBUG"/> - </category> - - <category name="org"> - <priority value="INFO"/> - </category> - - <category name="net"> - <priority value="INFO"/> - </category> - - <!-- ======================= --> - <!-- Setup the Root category --> - <!-- ======================= --> - - <root> - <level value="DEBUG"/> - <appender-ref ref="CONSOLE"/> - <appender-ref ref="FILE"/> - </root> - -</log4j:configuration> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/71dc43eb/services/secondary-storage/scripts/_run.sh ---------------------------------------------------------------------- diff --git a/services/secondary-storage/scripts/_run.sh b/services/secondary-storage/scripts/_run.sh deleted file mode 100755 index cb9624c..0000000 --- a/services/secondary-storage/scripts/_run.sh +++ /dev/null @@ -1,64 +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. - - - - - -#run.sh runs the console proxy. - -# make sure we delete the old files from the original template -rm console-proxy.jar -rm console-common.jar -rm conf/cloud.properties - -set -x - -CP=./:./conf -for file in *.jar -do - CP=${CP}:$file -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" -for i in $CMDLINE - do - KEY=$(echo $i | cut -s -d= -f1) - VALUE=$(echo $i | cut -s -d= -f2) - [ "$KEY" == "" ] && continue - case $KEY in - *) - keyvalues="${keyvalues} $KEY=$VALUE" - esac - done - -tot_mem_k=$(cat /proc/meminfo | grep MemTotal | awk '{print $2}') -let "tot_mem_m=tot_mem_k>>10" -let "eightypcnt=$tot_mem_m*8/10" -let "maxmem=$tot_mem_m-80" - -if [ $maxmem -gt $eightypcnt ] -then - maxmem=$eightypcnt -fi - -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/71dc43eb/services/secondary-storage/scripts/config_auth.sh ---------------------------------------------------------------------- diff --git a/services/secondary-storage/scripts/config_auth.sh b/services/secondary-storage/scripts/config_auth.sh deleted file mode 100755 index 4b74f8e..0000000 --- a/services/secondary-storage/scripts/config_auth.sh +++ /dev/null @@ -1,69 +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. - - - - - - -BASE_DIR="/var/www/html/copy/template/" -HTACCESS="$BASE_DIR/.htaccess" - -PASSWDFILE="/etc/httpd/.htpasswd" -if [ -d /etc/apache2 ] -then - PASSWDFILE="/etc/apache2/.htpasswd" -fi - -config_htaccess() { - mkdir -p $BASE_DIR - result=$? - echo "Options -Indexes" > $HTACCESS - let "result=$result+$?" - echo "AuthType Basic" >> $HTACCESS - let "result=$result+$?" - echo "AuthName \"Authentication Required\"" >> $HTACCESS - let "result=$result+$?" - echo "AuthUserFile \"$PASSWDFILE\"" >> $HTACCESS - let "result=$result+$?" - echo "Require valid-user" >> $HTACCESS - let "result=$result+$?" - return $result -} - -write_passwd() { - local user=$1 - local passwd=$2 - htpasswd -bc $PASSWDFILE $user $passwd - return $? -} - -if [ $# -ne 2 ] ; then - echo $"Usage: `basename $0` username password " - exit 0 -fi - -write_passwd $1 $2 -if [ $? -ne 0 ] -then - echo "Failed to update password" - exit 2 -fi - -config_htaccess -exit $? http://git-wip-us.apache.org/repos/asf/cloudstack/blob/71dc43eb/services/secondary-storage/scripts/config_ssl.sh ---------------------------------------------------------------------- diff --git a/services/secondary-storage/scripts/config_ssl.sh b/services/secondary-storage/scripts/config_ssl.sh deleted file mode 100755 index e474787..0000000 --- a/services/secondary-storage/scripts/config_ssl.sh +++ /dev/null @@ -1,183 +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. - - - - -help() { - printf " -c use customized key/cert\n" - printf " -k path of private key\n" - printf " -p path of certificate of public key\n" - printf " -t path of certificate chain\n" -} - - -config_httpd_conf() { - local ip=$1 - local srvr=$2 - cp -f /etc/httpd/conf/httpd.conf.orig /etc/httpd/conf/httpd.conf - sed -i -e "s/Listen.*:80$/Listen $ip:80/" /etc/httpd/conf/httpd.conf - echo "<VirtualHost $ip:443> " >> /etc/httpd/conf/httpd.conf - echo " DocumentRoot /var/www/html/" >> /etc/httpd/conf/httpd.conf - echo " ServerName $srvr" >> /etc/httpd/conf/httpd.conf - echo " SSLEngine on" >> /etc/httpd/conf/httpd.conf - echo " SSLCertificateFile /etc/httpd/ssl/certs/realhostip.crt" >> /etc/httpd/conf/httpd.conf - echo " SSLCertificateKeyFile /etc/httpd/ssl/keys/realhostip.key" >> /etc/httpd/conf/httpd.conf - echo "</VirtualHost>" >> /etc/httpd/conf/httpd.conf -} - -config_apache2_conf() { - local ip=$1 - local srvr=$2 - cp -f /etc/apache2/sites-available/default.orig /etc/apache2/sites-available/default - cp -f /etc/apache2/sites-available/default-ssl.orig /etc/apache2/sites-available/default-ssl - sed -i -e "s/<VirtualHost.*>/<VirtualHost $ip:80>/" /etc/apache2/sites-available/default - sed -i -e "s/<VirtualHost.*>/<VirtualHost $ip:443>/" /etc/apache2/sites-available/default-ssl - sed -i -e "s/Listen .*:80/Listen $ip:80/g" /etc/apache2/ports.conf - sed -i -e "s/Listen .*:443/Listen $ip:443/g" /etc/apache2/ports.conf - sed -i -e "s/NameVirtualHost .*:80/NameVirtualHost $ip:80/g" /etc/apache2/ports.conf - sed -i 's/ssl-cert-snakeoil.key/cert_apache.key/' /etc/apache2/sites-available/default-ssl - sed -i 's/ssl-cert-snakeoil.pem/cert_apache.crt/' /etc/apache2/sites-available/default-ssl -} - -copy_certs() { - local certdir=$(dirname $0)/certs - local mydir=$(dirname $0) - if [ -d $certdir ] && [ -f $customPrivKey ] && [ -f $customPrivCert ] ; then - mkdir -p /etc/httpd/ssl/keys && mkdir -p /etc/httpd/ssl/certs && cp $customprivKey /etc/httpd/ssl/keys && cp $customPrivCert /etc/httpd/ssl/certs - return $? - fi - if [ ! -z customCertChain ] && [ -f $customCertChain ] ; then - cp $customCertChain /etc/httpd/ssl/certs - fi - return 1 -} - -copy_certs_apache2() { - local certdir=$(dirname $0)/certs - local mydir=$(dirname $0) - if [ -f $customPrivKey ] && [ -f $customPrivCert ] ; then - cp $customPrivKey /etc/ssl/private/cert_apache.key && cp $customPrivCert /etc/ssl/certs/cert_apache.crt - fi - if [ ! -z "$customCertChain" ] && [ -f "$customCertChain" ] ; then - cp $customCertChain /etc/ssl/certs/cert_apache_chain.crt - fi - return 0 -} - - -cflag= -cpkflag= -cpcflag= -cccflag= -customPrivKey=$(dirname $0)/certs/realhostip.key -customPrivCert=$(dirname $0)/certs/realhostip.crt -customCertChain= -publicIp= -hostName= -keyStore=$(dirname $0)/certs/realhostip.keystore -aliasName="CPVMCertificate" -storepass="vmops.com" -while getopts 'i:h:k:p:t:c' OPTION -do - case $OPTION in - c) cflag=1 - ;; - k) cpkflag=1 - customPrivKey="$OPTARG" - ;; - p) cpcflag=1 - customPrivCert="$OPTARG" - ;; - t) cccflag=1 - customCertChain="$OPTARG" - ;; - i) publicIp="$OPTARG" - ;; - h) hostName="$OPTARG" - ;; - ?) help - ;; - esac -done - - -if [ -z "$publicIp" ] || [ -z "$hostName" ] -then - help - exit 1 -fi - -if [ "$cflag" == "1" ] -then - if [ "$cpkflag$cpcflag" != "11" ] - then - help - exit 1 - fi - if [ ! -f "$customPrivKey" ] - then - printf "priviate key file is not exist\n" - exit 2 - fi - - if [ ! -f "$customPrivCert" ] - then - printf "public certificate is not exist\n" - exit 3 - fi - - if [ "$cccflag" == "1" ] - then - if [ ! -f "$customCertChain" ] - then - printf "certificate chain is not exist\n" - exit 4 - fi - fi -fi - -if [ -d /etc/apache2 ] -then - copy_certs_apache2 -else - copy_certs -fi - -if [ $? -ne 0 ] -then - echo "Failed to copy certificates" - exit 2 -fi - -if [ -f "$customPrivCert" ] -then - keytool -delete -alias $aliasName -keystore $keyStore -storepass $storepass -noprompt - keytool -import -alias $aliasName -keystore $keyStore -storepass $storepass -noprompt -file $customPrivCert -fi - -if [ -d /etc/apache2 ] -then - config_apache2_conf $publicIp $hostName - /etc/init.d/apache2 stop - /etc/init.d/apache2 start -else - config_httpd_conf $publicIp $hostName -fi - - http://git-wip-us.apache.org/repos/asf/cloudstack/blob/71dc43eb/services/secondary-storage/scripts/ipfirewall.sh ---------------------------------------------------------------------- diff --git a/services/secondary-storage/scripts/ipfirewall.sh b/services/secondary-storage/scripts/ipfirewall.sh deleted file mode 100755 index 4711b8a..0000000 --- a/services/secondary-storage/scripts/ipfirewall.sh +++ /dev/null @@ -1,50 +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. - -BASE_DIR="/var/www/html/copy/" -HTACCESS="$BASE_DIR/.htaccess" - -config_htaccess() { - mkdir -p $BASE_DIR - result=$? - echo "Options -Indexes" > $HTACCESS - let "result=$result+$?" - echo "order deny,allow" >> $HTACCESS - let "result=$result+$?" - echo "deny from all" >> $HTACCESS - let "result=$result+$?" - return $result -} - -ips(){ - echo "allow from $1" >> $HTACCESS - result=$? - return $result -} - -is_append="$1" -shift -if [ $is_append != "true" ]; then - config_htaccess -fi -for i in $@ -do - ips "$i" -done -exit $? - http://git-wip-us.apache.org/repos/asf/cloudstack/blob/71dc43eb/services/secondary-storage/scripts/run-proxy.sh ---------------------------------------------------------------------- diff --git a/services/secondary-storage/scripts/run-proxy.sh b/services/secondary-storage/scripts/run-proxy.sh deleted file mode 100644 index d6ccf7c..0000000 --- a/services/secondary-storage/scripts/run-proxy.sh +++ /dev/null @@ -1,48 +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. - - - - - -#run.sh runs the console proxy. - -# make sure we delete the old files from the original template -rm console-proxy.jar -rm console-common.jar -rm conf/cloud.properties - -CP=./:./conf -for file in *.jar -do - CP=${CP}:$file -done - -#CMDLINE=$(cat /proc/cmdline) -#for i in $CMDLINE -# do -# KEY=$(echo $i | cut -d= -f1) -# VALUE=$(echo $i | cut -d= -f2) -# case $KEY in -# mgmt_host) -# MGMT_HOST=$VALUE -# ;; -# esac -# done - -java -mx700m -cp $CP:./conf com.cloud.consoleproxy.ConsoleProxy $@ http://git-wip-us.apache.org/repos/asf/cloudstack/blob/71dc43eb/services/secondary-storage/scripts/run.bat ---------------------------------------------------------------------- diff --git a/services/secondary-storage/scripts/run.bat b/services/secondary-storage/scripts/run.bat deleted file mode 100644 index ce6dc40..0000000 --- a/services/secondary-storage/scripts/run.bat +++ /dev/null @@ -1,18 +0,0 @@ -rem Licensed to the Apache Software Foundation (ASF) under one -rem or more contributor license agreements. See the NOTICE file -rem distributed with this work for additional information -rem regarding copyright ownership. The ASF licenses this file -rem to you under the Apache License, Version 2.0 (the -rem "License"); you may not use this file except in compliance -rem with the License. You may obtain a copy of the License at -rem -rem http://www.apache.org/licenses/LICENSE-2.0 -rem -rem Unless required by applicable law or agreed to in writing, -rem software distributed under the License is distributed on an -rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -rem KIND, either express or implied. See the License for the -rem specific language governing permissions and limitations -rem under the License. - -java -mx700m -cp cloud-console-proxy.jar;;cloud-console-common.jar;log4j-1.2.15.jar;apache-log4j-extras-1.0.jar;gson-1.3.jar;commons-logging-1.1.1.jar;.;.\conf; com.cloud.consoleproxy.ConsoleProxy %* http://git-wip-us.apache.org/repos/asf/cloudstack/blob/71dc43eb/services/secondary-storage/scripts/run.sh ---------------------------------------------------------------------- diff --git a/services/secondary-storage/scripts/run.sh b/services/secondary-storage/scripts/run.sh deleted file mode 100755 index 146d96f..0000000 --- a/services/secondary-storage/scripts/run.sh +++ /dev/null @@ -1,45 +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. - - - - - -#_run.sh runs the agent client. - -# set -x - -while true -do - ./_run.sh "$@" & - wait - ex=$? - if [ $ex -eq 0 ] || [ $ex -eq 1 ] || [ $ex -eq 66 ] || [ $ex -gt 128 ]; then - # permanent errors - sleep 5 - fi - - # user stop agent by service cloud stop - grep 'stop' /usr/local/cloud/systemvm/user_request &>/dev/null - if [ $? -eq 0 ]; then - timestamp=$(date) - echo "$timestamp User stops cloud.com service" >> /var/log/cloud.log - exit 0 - fi - sleep 5 -done http://git-wip-us.apache.org/repos/asf/cloudstack/blob/71dc43eb/services/secondary-storage/scripts/ssvm-check.sh ---------------------------------------------------------------------- diff --git a/services/secondary-storage/scripts/ssvm-check.sh b/services/secondary-storage/scripts/ssvm-check.sh deleted file mode 100644 index 7b83c98..0000000 --- a/services/secondary-storage/scripts/ssvm-check.sh +++ /dev/null @@ -1,136 +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. - - -# Health check script for the Secondary Storage VM - -# DNS server is specified. - - -CMDLINE=/var/cache/cloud/cmdline -for i in `cat $CMDLINE` -do - key=`echo $i | cut -d= -f1` - value=`echo $i | cut -d= -f2` - case $key in - host) - MGMTSERVER=$value - ;; - esac -done - - -# ping dns server -echo ================================================ -DNSSERVER=`egrep '^nameserver' /etc/resolv.conf | awk '{print $2}'| head -1` -echo "First DNS server is " $DNSSERVER -ping -c 2 $DNSSERVER -if [ $? -eq 0 ] -then - echo "Good: Can ping DNS server" -else - echo "WARNING: cannot ping DNS server" - echo "route follows" - route -n -fi - - -# check dns resolve -echo ================================================ -nslookup download.cloud.com 1> /tmp/dns 2>&1 -grep 'no servers could' /tmp/dns 1> /dev/null 2>&1 -if [ $? -eq 0 ] -then - echo "ERROR: DNS not resolving download.cloud.com" - echo resolv.conf follows - cat /etc/resolv.conf - exit 2 -else - echo "Good: DNS resolves download.cloud.com" -fi - - -# check to see if we have the NFS volume mounted -echo ================================================ -mount|grep -v sunrpc|grep -v rpc_pipefs|grep nfs 1> /dev/null 2>&1 -if [ $? -eq 0 ] -then - echo "NFS is currently mounted" - # check for write access - for MOUNTPT in `mount|grep -v sunrpc|grep -v rpc_pipefs|grep nfs| awk '{print $3}'` - do - if [ $MOUNTPT != "/proc/xen" ] # mounted by xen - then - echo Mount point is $MOUNTPT - touch $MOUNTPT/foo - if [ $? -eq 0 ] - then - echo "Good: Can write to mount point" - rm $MOUNTPT/foo - else - echo "ERROR: Cannot write to mount point" - echo "You need to export with norootsquash" - fi - fi - done -else - echo "ERROR: NFS is not currently mounted" - echo "Try manually mounting from inside the VM" - NFSSERVER=`awk '{print $17}' $CMDLINE|awk -F= '{print $2}'|awk -F: '{print $1}'` - echo "NFS server is " $NFSSERVER - ping -c 2 $NFSSERVER - if [ $? -eq 0 ] - then - echo "Good: Can ping NFS server" - else - echo "WARNING: cannot ping NFS server" - echo routing table follows - route -n - fi -fi - - -# check for connectivity to the management server -echo ================================================ -echo Management server is $MGMTSERVER. Checking connectivity. -socatout=$(echo | socat - TCP:$MGMTSERVER:8250,connect-timeout=3 2>&1) -if [ $? -eq 0 ] -then - echo "Good: Can connect to management server port 8250" -else - echo "ERROR: Cannot connect to $MGMTSERVER port 8250" - echo $socatout - exit 4 -fi - - -# check for the java process running -echo ================================================ -ps -eaf|grep -v grep|grep java 1> /dev/null 2>&1 -if [ $? -eq 0 ] -then - echo "Good: Java process is running" -else - echo "ERROR: Java process not running. Try restarting the SSVM." - exit 3 -fi - -echo ================================================ -echo Tests Complete. Look for ERROR or WARNING above. - -exit 0 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/71dc43eb/systemvm/conf/agent.properties.ssvm ---------------------------------------------------------------------- diff --git a/systemvm/conf/agent.properties.ssvm b/systemvm/conf/agent.properties.ssvm new file mode 100644 index 0000000..507ea4d --- /dev/null +++ b/systemvm/conf/agent.properties.ssvm @@ -0,0 +1,4 @@ +#mount.path=~/secondary-storage/ +resource=org.apache.cloudstack.storage.resource.NfsSecondaryStorageResource +testCifsMount=cifs://192.168.1.1/CSHV3?user=administrator&password=1pass%40word1 +#testLocalRoot=test http://git-wip-us.apache.org/repos/asf/cloudstack/blob/71dc43eb/systemvm/scripts/ssvm-check.sh ---------------------------------------------------------------------- diff --git a/systemvm/scripts/ssvm-check.sh b/systemvm/scripts/ssvm-check.sh new file mode 100644 index 0000000..7b83c98 --- /dev/null +++ b/systemvm/scripts/ssvm-check.sh @@ -0,0 +1,136 @@ +#!/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. + + +# Health check script for the Secondary Storage VM + +# DNS server is specified. + + +CMDLINE=/var/cache/cloud/cmdline +for i in `cat $CMDLINE` +do + key=`echo $i | cut -d= -f1` + value=`echo $i | cut -d= -f2` + case $key in + host) + MGMTSERVER=$value + ;; + esac +done + + +# ping dns server +echo ================================================ +DNSSERVER=`egrep '^nameserver' /etc/resolv.conf | awk '{print $2}'| head -1` +echo "First DNS server is " $DNSSERVER +ping -c 2 $DNSSERVER +if [ $? -eq 0 ] +then + echo "Good: Can ping DNS server" +else + echo "WARNING: cannot ping DNS server" + echo "route follows" + route -n +fi + + +# check dns resolve +echo ================================================ +nslookup download.cloud.com 1> /tmp/dns 2>&1 +grep 'no servers could' /tmp/dns 1> /dev/null 2>&1 +if [ $? -eq 0 ] +then + echo "ERROR: DNS not resolving download.cloud.com" + echo resolv.conf follows + cat /etc/resolv.conf + exit 2 +else + echo "Good: DNS resolves download.cloud.com" +fi + + +# check to see if we have the NFS volume mounted +echo ================================================ +mount|grep -v sunrpc|grep -v rpc_pipefs|grep nfs 1> /dev/null 2>&1 +if [ $? -eq 0 ] +then + echo "NFS is currently mounted" + # check for write access + for MOUNTPT in `mount|grep -v sunrpc|grep -v rpc_pipefs|grep nfs| awk '{print $3}'` + do + if [ $MOUNTPT != "/proc/xen" ] # mounted by xen + then + echo Mount point is $MOUNTPT + touch $MOUNTPT/foo + if [ $? -eq 0 ] + then + echo "Good: Can write to mount point" + rm $MOUNTPT/foo + else + echo "ERROR: Cannot write to mount point" + echo "You need to export with norootsquash" + fi + fi + done +else + echo "ERROR: NFS is not currently mounted" + echo "Try manually mounting from inside the VM" + NFSSERVER=`awk '{print $17}' $CMDLINE|awk -F= '{print $2}'|awk -F: '{print $1}'` + echo "NFS server is " $NFSSERVER + ping -c 2 $NFSSERVER + if [ $? -eq 0 ] + then + echo "Good: Can ping NFS server" + else + echo "WARNING: cannot ping NFS server" + echo routing table follows + route -n + fi +fi + + +# check for connectivity to the management server +echo ================================================ +echo Management server is $MGMTSERVER. Checking connectivity. +socatout=$(echo | socat - TCP:$MGMTSERVER:8250,connect-timeout=3 2>&1) +if [ $? -eq 0 ] +then + echo "Good: Can connect to management server port 8250" +else + echo "ERROR: Cannot connect to $MGMTSERVER port 8250" + echo $socatout + exit 4 +fi + + +# check for the java process running +echo ================================================ +ps -eaf|grep -v grep|grep java 1> /dev/null 2>&1 +if [ $? -eq 0 ] +then + echo "Good: Java process is running" +else + echo "ERROR: Java process not running. Try restarting the SSVM." + exit 3 +fi + +echo ================================================ +echo Tests Complete. Look for ERROR or WARNING above. + +exit 0 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/71dc43eb/systemvm/systemvm-descriptor.xml ---------------------------------------------------------------------- diff --git a/systemvm/systemvm-descriptor.xml b/systemvm/systemvm-descriptor.xml index 2eb4abc..1a943b0 100644 --- a/systemvm/systemvm-descriptor.xml +++ b/systemvm/systemvm-descriptor.xml @@ -37,15 +37,6 @@ <fileMode>555</fileMode> </fileSet> <fileSet> - <directory>../services/secondary-storage/scripts/</directory> - <outputDirectory></outputDirectory> - <directoryMode>555</directoryMode> - <fileMode>555</fileMode> - <includes> - <include>ssvm-check.sh</include> - </includes> - </fileSet> - <fileSet> <directory>scripts</directory> <outputDirectory></outputDirectory> <directoryMode>555</directoryMode>
