You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ed...@apache.org on 2012/09/13 05:51:31 UTC
[1/2] git commit: CLOUDSTACK-57,
CLOUDSTACK-14 remove unnecessary build/deploy folder,
and add CAStorSDK-1.3.1-CS40.jar into rpm/deb build system
Updated Branches:
refs/heads/master 4c3ab1afb -> 5e3921519
CLOUDSTACK-57, CLOUDSTACK-14
remove unnecessary build/deploy folder, and add CAStorSDK-1.3.1-CS40.jar into rpm/deb build system
Conflicts:
debian/cloud-deps.install
wscript_build
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/5e392151
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/5e392151
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/5e392151
Branch: refs/heads/master
Commit: 5e3921519ad99b25ae7625c84cafd4e72948ae10
Parents: 4c3ab1a
Author: Edison Su <su...@gmail.com>
Authored: Wed Sep 12 20:47:20 2012 -0700
Committer: Edison Su <su...@gmail.com>
Committed: Wed Sep 12 20:47:20 2012 -0700
----------------------------------------------------------------------
build/build-cloud-plugins.xml | 1 -
build/build-cloud.xml | 18 +-
build/deploy/branding/default/images/favicon.ico | Bin 1406 -> 0 bytes
.../deploy/branding/default/images/header_logo.gif | Bin 5319 -> 0 bytes
.../deploy/branding/godaddy/images/header_logo.gif | Bin 3047 -> 0 bytes
.../deploy/branding/nframe/images/header_logo.gif | Bin 2774 -> 0 bytes
.../deploy/branding/superb/images/header_logo.gif | Bin 2837 -> 0 bytes
build/deploy/db/deploy-db.sh | 126 ----
build/deploy/db/log4j.properties | 24 -
build/deploy/deploy-agent.sh | 232 ------
build/deploy/deploy-console-proxy.sh | 90 ---
build/deploy/deploy-server.sh | 121 ----
build/deploy/deploy-simulator.sh | 200 ------
build/deploy/install-storage-server.sh | 149 ----
build/deploy/install.sh | 155 ----
.../consoleproxy/conf/consoleproxy.properties | 23 -
build/deploy/production/db/server-setup-dev.xml | 550 ---------------
build/deploy/production/db/templates-dev.sql | 30 -
.../production/premium/conf/log4j-cloud_usage.xml | 85 ---
.../premium/conf/log4j-cloud_usage.xml.template | 85 ---
.../production/premium/conf/usage-components.xml | 67 --
.../production/server/conf/agent-update.properties | 18 -
.../production/server/conf/cloud-localhost.pk12 | Bin 1597 -> 0 bytes
build/deploy/production/server/conf/ehcache.xml | 544 --------------
.../deploy/production/server/conf/log4j-cloud.xml | 131 ----
.../server/conf/log4j-cloud.xml.template | 107 ---
build/deploy/production/server/conf/server.xml | 149 ----
build/package.xml | 23 -
cloud.spec | 1 +
29 files changed, 2 insertions(+), 2927 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e392151/build/build-cloud-plugins.xml
----------------------------------------------------------------------
diff --git a/build/build-cloud-plugins.xml b/build/build-cloud-plugins.xml
index 5b99565..207ef71 100755
--- a/build/build-cloud-plugins.xml
+++ b/build/build-cloud-plugins.xml
@@ -119,7 +119,6 @@
<property name="tools.dir" location="${base.dir}/tools" />
<!-- <property name="antcontrib.dir" location="${tools.dir}/tools/ant/apache-ant-1.8.0/lib" />-->
<property name="deploy.dir" location="${build.dir}/deploy" />
- <property name="production.dir" location="${deploy.dir}/production" />
<property name="meld.home" location="/usr/local/bin" />
<property name="assertion" value="-da" />
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e392151/build/build-cloud.xml
----------------------------------------------------------------------
diff --git a/build/build-cloud.xml b/build/build-cloud.xml
index e68d97a..1b25fac 100755
--- a/build/build-cloud.xml
+++ b/build/build-cloud.xml
@@ -61,7 +61,6 @@
<import file="${build.dir}/build-common.xml" />
<!-- In case these didn't get defined in the build-cloud.properties -->
- <property name="branding.name" value="default" />
<property name="tomcat.home" value="${env.CATALINA_HOME}" />
<property name="deprecation" value="off" />
<property name="target.compat.version" value="1.6" />
@@ -113,17 +112,12 @@
<property name="tools.dir" location="${base.dir}/tools" />
<!-- <property name="antcontrib.dir" location="${tools.dir}/tools/ant/apache-ant-1.8.0/lib" />-->
- <property name="deploy.dir" location="${build.dir}/deploy" />
- <property name="production.dir" location="${deploy.dir}/production" />
<property name="meld.home" location="/usr/local/bin" />
<property name="assertion" value="-da" />
<!-- directory for vmware-base library -->
<property name="vmware-base.dir" location="${base.dir}/vmware-base" />
- <!-- directories for branding -->
- <property name="branding.dir" location="${build.dir}/deploy/branding/${branding.name}" />
-
<property name="core.jar" value="cloud-core.jar" />
<property name="utils.jar" value="cloud-utils.jar" />
<property name="server.jar" value="cloud-server.jar" />
@@ -374,7 +368,7 @@
</fileset>
</copy>
<copy todir="${copyto.dir}/conf">
- <fileset dir="${production.dir}/consoleproxy/conf">
+ <fileset dir="${console-proxy.dir}/conf">
<include name="log4j-cloud.xml" />
<include name="consoleproxy.properties" />
</fileset>
@@ -487,17 +481,9 @@
<target name="build-servers" depends="-init, build-server" />
<target name="build-opensource" depends="-init, build-server, build-agent, build-scripts, build-ui, build-console-proxy, package-oss-systemvm-iso">
- <copy overwrite="true" todir="${dist.dir}">
- <fileset dir="${base.dir}/build/deploy/">
- <include name="deploy-agent.sh" />
- <include name="deploy-server.sh" />
- <include name="deploy-console-proxy.sh" />
- <include name="install.sh" />
- </fileset>
<fileset dir="${base.dir}/client">
<include name="setup/**/*" />
</fileset>
- </copy>
<copy overwrite="true" todir="${jar.dir}">
<fileset dir="${deps.dir}">
@@ -505,8 +491,6 @@
</fileset>
</copy>
- <chmod file="${dist.dir}/deploy-agent.sh" perm="uog+xr" />
- <chmod file="${dist.dir}/deploy-server.sh" perm="uog+xr" />
</target>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e392151/build/deploy/branding/default/images/favicon.ico
----------------------------------------------------------------------
diff --git a/build/deploy/branding/default/images/favicon.ico b/build/deploy/branding/default/images/favicon.ico
deleted file mode 100644
index 97a1e14..0000000
Binary files a/build/deploy/branding/default/images/favicon.ico and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e392151/build/deploy/branding/default/images/header_logo.gif
----------------------------------------------------------------------
diff --git a/build/deploy/branding/default/images/header_logo.gif b/build/deploy/branding/default/images/header_logo.gif
deleted file mode 100644
index a1eb06d..0000000
Binary files a/build/deploy/branding/default/images/header_logo.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e392151/build/deploy/branding/godaddy/images/header_logo.gif
----------------------------------------------------------------------
diff --git a/build/deploy/branding/godaddy/images/header_logo.gif b/build/deploy/branding/godaddy/images/header_logo.gif
deleted file mode 100644
index c1e7dd1..0000000
Binary files a/build/deploy/branding/godaddy/images/header_logo.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e392151/build/deploy/branding/nframe/images/header_logo.gif
----------------------------------------------------------------------
diff --git a/build/deploy/branding/nframe/images/header_logo.gif b/build/deploy/branding/nframe/images/header_logo.gif
deleted file mode 100644
index d1ac0e0..0000000
Binary files a/build/deploy/branding/nframe/images/header_logo.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e392151/build/deploy/branding/superb/images/header_logo.gif
----------------------------------------------------------------------
diff --git a/build/deploy/branding/superb/images/header_logo.gif b/build/deploy/branding/superb/images/header_logo.gif
deleted file mode 100644
index 4dee916..0000000
Binary files a/build/deploy/branding/superb/images/header_logo.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e392151/build/deploy/db/deploy-db.sh
----------------------------------------------------------------------
diff --git a/build/deploy/db/deploy-db.sh b/build/deploy/db/deploy-db.sh
deleted file mode 100755
index bf0db63..0000000
--- a/build/deploy/db/deploy-db.sh
+++ /dev/null
@@ -1,126 +0,0 @@
-#!/usr/bin/env bash
-#
-# deploy-db.sh -- deploys the database configuration.
-#
-# 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.
-
-
-# set -x
-
-if [ "$1" == "" ]; then
- printf "Usage: %s [path to additional sql] [root password]\n" $(basename $0) >&2
- exit 1;
-fi
-
-if [ ! -f $1 ]; then
- echo "Error: Unable to find $1"
- exit 2
-fi
-
-if [ "$2" != "" ]; then
- if [ ! -f $2 ]; then
- echo "Error: Unable to find $2"
- exit 3
- fi
-fi
-
-if [ ! -f create-database.sql ]; then
- printf "Error: Unable to find create-database.sql\n"
- exit 4
-fi
-
-if [ ! -f create-schema.sql ]; then
- printf "Error: Unable to find create-schema.sql\n"
- exit 5
-fi
-
-if [ ! -f create-index-fk.sql ]; then
- printf "Error: Unable to find create-index-fk.sql\n"
- exit 6;
-fi
-
-PATHSEP=':'
-if [[ $OSTYPE == "cygwin" ]] ; then
- export CATALINA_HOME=`cygpath -m $CATALINA_HOME`
- PATHSEP=';'
-else
- mysql="mysql"
- service mysql status > /dev/null 2>/dev/null
- if [ $? -eq 1 ]; then
- mysql="mysqld"
- service mysqld status > /dev/null 2>/dev/null
- if [ $? -ne 0 ]; then
- printf "Unable to find mysql daemon\n"
- exit 7
- fi
- fi
-
- echo "Starting mysql"
- service $mysql start > /dev/null 2>/dev/null
-
-fi
-
-echo "Recreating Database."
-mysql --user=root --password=$3 < create-database.sql > /dev/null 2>/dev/null
-mysqlout=$?
-if [ $mysqlout -eq 1 ]; then
- printf "Please enter root password for MySQL.\n"
- mysql --user=root --password < create-database.sql
- if [ $? -ne 0 ]; then
- printf "Error: Cannot execute create-database.sql\n"
- exit 10
- fi
-elif [ $mysqlout -ne 0 ]; then
- printf "Error: Cannot execute create-database.sql\n"
- exit 11
-fi
-
-mysql --user=cloud --password=cloud cloud < create-schema.sql
-if [ $? -ne 0 ]; then
- printf "Error: Cannot execute create-schema.sql\n"
- exit 11
-fi
-
-mysql --user=cloud --password=cloud cloud < create-schema-premium.sql
-if [ $? -ne 0 ]; then
- printf "Error: Cannot execute create-schema-premium.sql\n"
- exit 11
-fi
-
-if [ "$1" != "" ]; then
- mysql --user=cloud --password=cloud cloud < $1
- if [ $? -ne 0 ]; then
- printf "Error: Cannot execute $1\n"
- exit 12
- fi
-fi
-
-if [ "$2" != "" ]; then
- echo "Adding Templates"
- mysql --user=cloud --password=cloud cloud < $2
- if [ $? -ne 0 ]; then
- printf "Error: Cannot execute $2\n"
- exit 12
- fi
-fi
-
-
-echo "Creating Indice and Foreign Keys"
-mysql --user=cloud --password=cloud cloud < create-index-fk.sql
-if [ $? -ne 0 ]; then
- printf "Error: Cannot execute create-index-fk.sql\n"
- exit 13
-fi
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e392151/build/deploy/db/log4j.properties
----------------------------------------------------------------------
diff --git a/build/deploy/db/log4j.properties b/build/deploy/db/log4j.properties
deleted file mode 100644
index a25bde4..0000000
--- a/build/deploy/db/log4j.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-# 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.
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.Target=System.out
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
-log4j.appender.stdout.threshold=ERROR
-log4j.rootLogger=INFO, stdout
-log4j.category.org.apache=INFO, stdout
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e392151/build/deploy/deploy-agent.sh
----------------------------------------------------------------------
diff --git a/build/deploy/deploy-agent.sh b/build/deploy/deploy-agent.sh
deleted file mode 100755
index ff4fd3c..0000000
--- a/build/deploy/deploy-agent.sh
+++ /dev/null
@@ -1,232 +0,0 @@
-#!/usr/bin/env bash
-#
-# install.sh -- installs an agent
-#
-# 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.
-
-
-usage() {
- printf "Usage: %s: -d [directory to deploy to] -t [routing|storage|computing] -z [zip file] -h [host] -p [pod] -c [data center] -m [expert|novice|setup]\n" $(basename $0) >&2
-}
-
-mode=
-host=
-pod=
-zone=
-
-deploydir=
-confdir=
-zipfile=
-typ=
-
-#set -x
-
-while getopts 'd:z:t:x:m:h:p:c:' OPTION
-do
- case "$OPTION" in
- d) deploydir="$OPTARG"
- ;;
- z) zipfile="$OPTARG"
- ;;
- t) typ="$OPTARG"
- ;;
- m) mode="$OPTARG"
- ;;
- h) host="$OPTARG"
- ;;
- p) pod="$OPTARG"
- ;;
- c) zone="$OPTARG"
- ;;
- ?) usage
- exit 2
- ;;
- esac
-done
-
-printf "NOTE: You must have root privileges to install and run this program.\n"
-
-if [ "$typ" == "" ]; then
- if [ "$mode" != "expert" ]
- then
- printf "Type of agent to install [routing|computing|storage]: "
- read typ
- fi
-fi
-if [ "$typ" != "computing" ] && [ "$typ" != "routing" ] && [ "$typ" != "storage" ]
-then
- printf "ERROR: The choices are computing, routing, or storage.\n"
- exit 4
-fi
-
-if [ "$host" == "" ]; then
- if [ "$mode" != "expert" ]
- then
- printf "Host name or ip address of management server [Required]: "
- read host
- if [ "$host" == "" ]; then
- printf "ERROR: Host is required\n"
- exit 23;
- fi
- fi
-fi
-
-port=
-if [ "$mode" != "expert" ]
-then
- printf "Port number of management server [defaults to 8250]: "
- read port
-fi
-if [ "$port" == "" ]
-then
- port=8250
-fi
-
-if [ "$zone" == "" ]; then
- if [ "$mode" != "expert" ]; then
- printf "Availability Zone [Required]: "
- read zone
- if [ "$zone" == "" ]; then
- printf "ERROR: Zone is required\n";
- exit 21;
- fi
- fi
-fi
-
-if [ "$pod" == "" ]; then
- if [ "$mode" != "expert" ]; then
- printf "Pod [Required]: "
- read pod
- if [ "$pod" == "" ]; then
- printf "ERROR: Pod is required\n";
- exit 22;
- fi
- fi
-fi
-
-workers=
-if [ "$mode" != "expert" ]; then
- printf "# of workers to start [defaults to 3]: "
- read workers
-fi
-if [ "$workers" == "" ]; then
- workers=3
-fi
-
-if [ "$deploydir" == "" ]; then
- if [ "$mode" != "expert" ]; then
- printf "Directory to deploy to [defaults to /usr/local/vmops/agent]: "
- read deploydir
- fi
- if [ "$deploydir" == "" ]; then
- deploydir="/usr/local/vmops/agent"
- fi
-fi
-if ! mkdir -p $deploydir
-then
- printf "ERROR: Unable to create $deploydir\n"
- exit 5
-fi
-
-if [ "$zipfile" == "" ]; then
- if [ "$mode" != "expert" ]; then
- printf "Path of the zip file [defaults to agent.zip]: "
- read zipfile
- fi
- if [ "$zipfile" == "" ]; then
- zipfile="agent.zip"
- fi
-
-fi
-if ! unzip -o $zipfile -d $deploydir
-then
- printf "ERROR: Unable to unzip $zipfile to $deploydir\n"
- exit 6
-fi
-
-#if ! chmod -R +x $deploydir/scripts/*.sh
-#then
-# printf "ERROR: Unable to change scripts to executable.\n"
-# exit 7
-#fi
-#if ! chmod -R +x $deploydir/scripts/iscsi/*.sh
-#then
-# printf "ERROR: Unable to change scripts to executable.\n"
-# exit 8
-#fi
-#if ! chmod -R +x $deploydir/*.sh
-#then
-# printf "ERROR: Unable to change scripts to executable.\n"
-# exit 9
-#fi
-
-if [ "$mode" == "setup" ]; then
- mode="expert"
- deploydir="/usr/local/vmops/agent"
- confdir="/etc/vmops"
- /bin/cp -f $deploydir/conf/agent.properties $confdir/agent.properties
- if [ $? -gt 0 ]; then
- printf "ERROR: Failed to copy the agent.properties file into the right place."
- exit 10;
- fi
-else
- confdir="$deploydir/conf"
-fi
-
-if [ "$typ" != "" ]; then
- sed s/@TYPE@/"$typ"/ $confdir/agent.properties > $confdir/tmp
- /bin/mv -f $confdir/tmp $confdir/agent.properties
-else
- printf "INFO: Type is not set\n"
-fi
-
-if [ "$host" != "" ]; then
- sed s/@HOST@/"$host"/ $confdir/agent.properties > $confdir/tmp
- /bin/mv -f $confdir/tmp $confdir/agent.properties
-else
- printf "INFO: host is not set\n"
-fi
-
-if [ "$port" != "" ]; then
- sed s/@PORT@/"$port"/ $confdir/agent.properties > $confdir/tmp
- /bin/mv -f $confdir/tmp $confdir/agent.properties
-else
- printf "INFO: Port is not set\n"
-fi
-
-if [ "$pod" != "" ]; then
- sed s/@POD@/"$pod"/ $confdir/agent.properties > $confdir/tmp
- /bin/mv -f $confdir/tmp $confdir/agent.properties
-else
- printf "INFO: Pod is not set\n"
-fi
-
-if [ "$zone" != "" ]; then
- sed s/@ZONE@/"$zone"/ $confdir/agent.properties > $confdir/tmp
- /bin/mv -f $confdir/tmp $confdir/agent.properties
-else
- printf "INFO: Zone is not set\n"
-fi
-
-if [ "$workers" != "" ]; then
- sed s/@WORKERS@/"$workers"/ $confdir/agent.properties > $confdir/tmp
- /bin/mv -f $confdir/tmp $confdir/agent.properties
-else
- printf "INFO: Workers is not set\n"
-fi
-
-printf "SUCCESS: Installation is now complete. If you like to make changes, edit $confdir/agent.properties\n"
-exit 0
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e392151/build/deploy/deploy-console-proxy.sh
----------------------------------------------------------------------
diff --git a/build/deploy/deploy-console-proxy.sh b/build/deploy/deploy-console-proxy.sh
deleted file mode 100644
index 662520f..0000000
--- a/build/deploy/deploy-console-proxy.sh
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/usr/bin/env bash
-#
-# Deploy console proxy package to an existing VM template
-#
-# 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.
-
-
-usage() {
- printf "Usage: %s: -d [work directory to deploy to] -z [zip file]" $(basename $0) >&2
-}
-
-deploydir=
-zipfile=
-
-#set -x
-
-while getopts 'd:z:' OPTION
-do
- case "$OPTION" in
- d) deploydir="$OPTARG"
- ;;
- z) zipfile="$OPTARG"
- ;;
- ?) usage
- exit 2
- ;;
- esac
-done
-
-printf "NOTE: You must have root privileges to install and run this program.\n"
-
-if [ "$deploydir" == "" ]; then
- printf "ERROR: Unable to find deployment work directory $deploydir\n"
- exit 3;
-fi
-if [ ! -f $deploydir/consoleproxy.tar.gz ]
-then
- printf "ERROR: Unable to find existing console proxy template file (consoleproxy.tar.gz) to work on at $deploydir\n"
- exit 5
-fi
-
-if [ "$zipfile" == "" ]; then
- zipfile="console-proxy.zip"
-fi
-
-if ! mkdir -p /mnt/consoleproxy
-then
- printf "ERROR: Unable to create /mnt/consoleproxy for mounting template image\n"
- exit 5
-fi
-
-tar xvfz $deploydir/consoleproxy.tar.gz -C $deploydir
-mount -o loop $deploydir/vmi-root-fc8-x86_64-domP /mnt/consoleproxy
-
-if ! unzip -o $zipfile -d /mnt/consoleproxy/usr/local/vmops/consoleproxy
-then
- printf "ERROR: Unable to unzip $zipfile to $deploydir\n"
- exit 6
-fi
-
-umount /mnt/consoleproxy
-
-pushd $deploydir
-tar cvf consoleproxy.tar vmi-root-fc8-x86_64-domP
-
-mv -f consoleproxy.tar.gz consoleproxy.tar.gz.old
-gzip consoleproxy.tar
-popd
-
-if [ ! -f $deploydir/consoleproxy.tar.gz ]
-then
- mv consoleproxy.tar.gz.old consoleproxy.tar.gz
- printf "ERROR: failed to deploy and recreate the template at $deploydir\n"
-fi
-
-printf "SUCCESS: Installation is now complete. please go to $deploydir to review it\n"
-exit 0
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e392151/build/deploy/deploy-server.sh
----------------------------------------------------------------------
diff --git a/build/deploy/deploy-server.sh b/build/deploy/deploy-server.sh
deleted file mode 100755
index fe77174..0000000
--- a/build/deploy/deploy-server.sh
+++ /dev/null
@@ -1,121 +0,0 @@
-#!/usr/bin/env bash
-#
-# deploy.sh -- deploys a management server
-#
-# 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.
-
-
-usage() {
- printf "Usage: %s: -d [tomcat directory to deploy to] -z [zip file to use]\n" $(basename $0) >&2
-}
-
-dflag=
-zflag=
-tflag=
-iflag=
-
-deploydir=
-zipfile="client.zip"
-typ=
-
-#set -x
-
-while getopts 'd:z:x:h:' OPTION
-do
- case "$OPTION" in
- d) dflag=1
- deploydir="$OPTARG"
- ;;
- z) zflag=1
- zipfile="$OPTARG"
- ;;
- h) iflag="$OPTARG"
- ;;
- ?) usage
- exit 2
- ;;
- esac
-done
-
-if [ "$deploydir" == "" ]
-then
- if [ "$CATALINA_HOME" == "" ]
- then
- printf "Tomcat Directory to deploy to: "
- read deploydir
- else
- deploydir="$CATALINA_HOME"
- fi
-fi
-
-if [ "$deploydir" == "" ]
-then
- printf "Tomcat directory was not specified\n";
- exit 15;
-fi
-
-printf "Check to see if the Tomcat directory exist: $deploydir\n"
-if [ ! -d $deploydir ]
-then
- printf "Tomcat directory does not exist\n";
- exit 16;
-fi
-
-if [ "$zipfile" == "" ]
-then
- printf "Path of the zip file [defaults to client.zip]: "
- read zipfile
- if [ "$zipfile" == "" ]
- then
- zipfile="client.zip"
- fi
-fi
-if ! unzip -o $zipfile client.war
-then
- exit 6
-fi
-
-rm -fr $deploydir/webapps/client
-
-if ! unzip -o ./client.war -d $deploydir/webapps/client
-then
- exit 10;
-fi
-
-rm -f ./client.war
-
-if ! unzip -o $zipfile lib/* -d $deploydir
-then
- exit 11;
-fi
-
-if ! unzip -o $zipfile conf/* -d $deploydir
-then
- exit 12;
-fi
-
-if ! unzip -o $zipfile bin/* -d $deploydir
-then
- exit 13;
-fi
-
-printf "Adding the conf directory to the class loader for tomcat\n"
-sed 's/shared.loader=$/shared.loader=\$\{catalina.home\},\$\{catalina.home\}\/conf\
-/' $deploydir/conf/catalina.properties > $deploydir/conf/catalina.properties.tmp
-mv $deploydir/conf/catalina.properties.tmp $deploydir/conf/catalina.properties
-
-printf "Installation is now complete\n"
-exit 0
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e392151/build/deploy/deploy-simulator.sh
----------------------------------------------------------------------
diff --git a/build/deploy/deploy-simulator.sh b/build/deploy/deploy-simulator.sh
deleted file mode 100644
index b2bfecd..0000000
--- a/build/deploy/deploy-simulator.sh
+++ /dev/null
@@ -1,200 +0,0 @@
-#!/usr/bin/env bash
-#
-# install.sh -- installs an agent
-#
-# 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.
-
-
-usage() {
- printf "Usage: %s: -d [directory to deploy to] -z [zip file] -h [host] -p [pod] -c [data center] -m [expert|novice|setup]\n" $(basename $0) >&2
-}
-
-mode=
-host=
-pod=
-zone=
-
-deploydir=
-confdir=
-zipfile=
-typ=
-
-#set -x
-
-while getopts 'd:z:x:m:h:p:c:' OPTION
-do
- case "$OPTION" in
- d) deploydir="$OPTARG"
- ;;
- z) zipfile="$OPTARG"
- ;;
- m) mode="$OPTARG"
- ;;
- h) host="$OPTARG"
- ;;
- p) pod="$OPTARG"
- ;;
- c) zone="$OPTARG"
- ;;
- ?) usage
- exit 2
- ;;
- esac
-done
-
-printf "NOTE: You must have root privileges to install and run this program.\n"
-
-if [ "$mode" == "setup" ]; then
- mode="expert"
- deploydir="/usr/local/cloud/agent-simulator"
- confdir="/etc/cloud"
- /bin/cp -f $deploydir/conf/agent.properties $confdir/agent.properties
- if [ $? -gt 0 ]; then
- printf "ERROR: Failed to copy the agent.properties file into the right place."
- exit 10;
- fi
-else
- confdir="$deploydir/conf"
-fi
-
-if [ "$host" == "" ]; then
- if [ "$mode" != "expert" ]
- then
- printf "Host name or ip address of management server [Required]: "
- read host
- if [ "$host" == "" ]; then
- printf "ERROR: Host is required\n"
- exit 23;
- fi
- fi
-fi
-
-port=
-if [ "$mode" != "expert" ]
-then
- printf "Port number of management server [defaults to 8250]: "
- read port
-fi
-if [ "$port" == "" ]
-then
- port=8250
-fi
-
-if [ "$zone" == "" ]; then
- if [ "$mode" != "expert" ]; then
- printf "Availability Zone [Required]: "
- read zone
- if [ "$zone" == "" ]; then
- printf "ERROR: Zone is required\n";
- exit 21;
- fi
- fi
-fi
-
-if [ "$pod" == "" ]; then
- if [ "$mode" != "expert" ]; then
- printf "Pod [Required]: "
- read pod
- if ["$pod" == ""]; then
- printf "ERROR: Pod is required\n";
- exit 22;
- fi
- fi
-fi
-
-workers=
-if [ "$mode" != "expert" ]; then
- printf "# of workers to start [defaults to 3]: "
- read workers
-fi
-if [ "$workers" == "" ]; then
- workers=3
-fi
-
-if [ "$deploydir" == "" ]; then
- if [ "$mode" != "expert" ]; then
- printf "Directory to deploy to [defaults to /usr/local/cloud/agent-simulator]: "
- read deploydir
- fi
- if [ "$deploydir" == "" ]; then
- deploydir="/usr/local/cloud/agent-simulator"
- fi
-fi
-if ! mkdir -p $deploydir
-then
- printf "ERROR: Unable to create $deploydir\n"
- exit 5
-fi
-
-if [ "$zipfile" == "" ]; then
- if [ "$mode" != "expert" ]; then
- printf "Path of the zip file [defaults to agent-simulator.zip]: "
- read zipfile
- fi
- if [ "$zipfile" == "" ]; then
- zipfile="agent-simulator.zip"
- fi
-
-fi
-if ! unzip -o $zipfile -d $deploydir
-then
- printf "ERROR: Unable to unzip $zipfile to $deploydir\n"
- exit 6
-fi
-
-if ! chmod +x $deploydir/*.sh
-then
- printf "ERROR: Unable to change scripts to executable.\n"
- exit 9
-fi
-
-if [ "$host" != "" ]; then
- sed s/@HOST@/"$host"/ $confdir/agent.properties > $confdir/tmp
- /bin/mv -f $confdir/tmp $confdir/agent.properties
-else
- printf "INFO: host is not set\n"
-fi
-
-if [ "$port" != "" ]; then
- sed s/@PORT@/"$port"/ $confdir/agent.properties > $confdir/tmp
- /bin/mv -f $confdir/tmp $confdir/agent.properties
-else
- printf "INFO: Port is not set\n"
-fi
-
-if [ "$pod" != "" ]; then
- sed s/@POD@/"$pod"/ $confdir/agent.properties > $confdir/tmp
- /bin/mv -f $confdir/tmp $confdir/agent.properties
-else
- printf "INFO: Pod is not set\n"
-fi
-
-if [ "$zone" != "" ]; then
- sed s/@ZONE@/"$zone"/ $confdir/agent.properties > $confdir/tmp
- /bin/mv -f $confdir/tmp $confdir/agent.properties
-else
- printf "INFO: Zone is not set\n"
-fi
-
-if [ "$workers" != "" ]; then
- sed s/@WORKERS@/"$workers"/ $confdir/agent.properties > $confdir/tmp
- /bin/mv -f $confdir/tmp $confdir/agent.properties
-else
- printf "INFO: Workers is not set\n"
-fi
-
-printf "SUCCESS: Installation is now complete. If you like to make changes, edit $confdir/agent.properties\n"
-exit 0
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e392151/build/deploy/install-storage-server.sh
----------------------------------------------------------------------
diff --git a/build/deploy/install-storage-server.sh b/build/deploy/install-storage-server.sh
deleted file mode 100755
index 5d1ed05..0000000
--- a/build/deploy/install-storage-server.sh
+++ /dev/null
@@ -1,149 +0,0 @@
-#!/usr/bin/env bash
-#
-# install-storage-server.sh: Installs a VMOps Storage Server
-#
-# 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.
-
-
-choose_correct_filename() {
- local default_filename=$1
- local user_specified_filename=$2
-
- if [ -f "$user_specified_filename" ]
- then
- echo $user_specified_filename
- return 0
- else
- if [ -f "$default_filename" ]
- then
- echo $default_filename
- return 0
- else
- echo ""
- return 1
- fi
- fi
-}
-
-install_opensolaris_package() {
- pkg_name=$1
-
- pkg info $pkg_name >> /dev/null
-
- if [ $? -gt 0 ]
- then
- # The package is not installed, so install it
- pkg install $pkg_name
- return $?
- else
- # The package is already installed
- return 0
- fi
-}
-
-exit_if_error() {
- return_code=$1
- msg=$2
-
- if [ $return_code -gt 0 ]
- then
- echo $msg
- exit 1
- fi
-}
-
-usage() {
- printf "Usage: ./install-storage-server.sh <path to agent.zip> <path to templates.tar.gz>"
-}
-
-AGENT_FILE=$(choose_correct_filename "./agent.zip" $1)
-exit_if_error $? "Please download agent.zip to your Storage Server."
-
-TEMPLATES_FILE=$(choose_correct_filename "./templates.tar.gz" $2)
-exit_if_error $? "Please download templates.tar.gz to your Storage Server."
-
-VMOPS_DIR="/usr/local/vmops"
-AGENT_DIR="/usr/local/vmops/agent"
-CONF_DIR="/etc/vmops"
-TEMPLATES_DIR="/root/template"
-
-# Make all the necessary directories if they don't already exist
-
-echo "Creating VMOps directories..."
-for dir in $VMOPS_DIR $CONF_DIR $TEMPLATES_DIR
-do
- mkdir -p $dir
-done
-
-# Unzip agent.zip to $AGENT_DIR
-
-echo "Uncompressing and installing VMOps Storage Agent..."
-unzip -o $AGENT_FILE -d $AGENT_DIR >> /dev/null
-
-# Remove agent/conf/agent.properties, since we should use the file in the real configuration directory
-
-rm $AGENT_DIR/conf/agent.properties
-
-# Backup any existing VMOps configuration files, if there aren't any backups already
-
-if [ ! -d $CONF_DIR/BACKUP ]
-then
- echo "Backing up existing configuration files..."
- mkdir -p $CONF_DIR/BACKUP
- cp $CONF_DIR/*.properties $CONF_DIR/BACKUP >> /dev/null
-fi
-
-# Copy all the files in storagehdpatch to their proper places
-
-echo "Installing system files..."
-(cd $AGENT_DIR/storagehdpatch; tar cf - .) | (cd /; tar xf -)
-exit_if_error $? "There was a problem with installing system files. Please contact VMOps Support."
-
-# Make vsetup executable
-chmod +x /usr/sbin/vsetup
-
-# Make vmops executable
-chmod +x /lib/svc/method/vmops
-
-# Uncompress the templates and copy them to the templates directory
-
-echo "Uncompressing templates..."
-tar -xzf $TEMPLATES_FILE -C $TEMPLATES_DIR >> /dev/null
-exit_if_error $? "There was a problem with uncompressing templates. Please contact VMOps Support."
-
-# Install the storage-server package, if it is not already installed
-echo "Installing OpenSolaris storage server package..."
-install_opensolaris_package "storage-server"
-exit_if_error $? "There was a problem with installing the storage server package. Please contact VMOps Support."
-
-echo "Installing COMSTAR..."
-install_opensolaris_package "SUNWiscsit"
-exit_if_error $? "Unable to install COMSTAR iscsi target. Please contact VMOps Support."
-
-# Install the SUNWinstall-test package, if it is not already installed
-
-echo "Installing OpenSolaris test tools package..."
-install_opensolaris_package "SUNWinstall-test"
-exit_if_error $? "There was a problem with installing the test tools package. Please contact VMOps Support."
-
-# Print a success message
-printf "\nSuccessfully installed the VMOps Storage Server.\n"
-printf "Please complete the following steps to configure your networking settings and storage pools:\n\n"
-printf "1. Specify networking settings in /etc/vmops/network.properties\n"
-printf "2. Run \"vsetup networking\" and then specify disk settings in /etc/vmops/disks.properties\n"
-printf "3. Run \"vsetup zpool\" and reboot the machine when prompted.\n\n"
-
-
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e392151/build/deploy/install.sh
----------------------------------------------------------------------
diff --git a/build/deploy/install.sh b/build/deploy/install.sh
deleted file mode 100644
index 26f9970..0000000
--- a/build/deploy/install.sh
+++ /dev/null
@@ -1,155 +0,0 @@
-#!/bin/bash
-#
-# install.sh -- installs MySQL, Java, Tomcat, and the VMOps server
-#
-# 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.
-
-
-#set -x
-set -e
-
-EX_NOHOSTNAME=15
-EX_SELINUX=16
-
-function usage() {
- printf "Usage: %s [path to server-setup.xml]\n" $(basename $0) >&2
- exit 64
-}
-
-function checkhostname() {
- if hostname | grep -qF . ; then true ; else
- echo "You need to have a fully-qualified host name for the setup to work." > /dev/stderr
- echo "Please use your operating system's network setup tools to set one." > /dev/stderr
- exit $EX_NOHOSTNAME
- fi
-}
-
-function checkselinux() {
-#### before checking arguments, make sure SELINUX is "permissible" in /etc/selinux/config
- if /usr/sbin/getenforce | grep -qi enforcing ; then borked=1 ; fi
- if grep -i SELINUX=enforcing /etc/selinux/config ; then borked=1 ; fi
- if [ "$borked" == "1" ] ; then
- echo "SELINUX is set to enforcing, please set it to permissive in /etc/selinux/config" > /dev/stderr
- echo "then reboot the machine, after which you can run the install script again." > /dev/stderr
- exit $EX_SELINUX
- fi
-}
-
-checkhostname
-checkselinux
-
-if [ "$1" == "" ]; then
- usage
-fi
-
-if [ ! -f $1 ]; then
- echo "Error: Unable to find $1" > /dev/stderr
- exit 2
-fi
-
-#### check that all files exist
-if [ ! -f apache-tomcat-6.0.18.tar.gz ]; then
- printf "Error: Unable to find apache-tomcat-6.0.18.tar.gz\n" > /dev/stderr
- exit 3
-fi
-
-if [ ! -f MySQL-client-5.1.30-0.glibc23.x86_64.rpm ]; then
- printf "Error: Unable to find MySQL-client-5.1.30-0.glibc23.x86_64.rpm\n" > /dev/stderr
- exit 4
-fi
-
-if [ ! -f MySQL-server-5.1.30-0.glibc23.x86_64.rpm ]; then
- printf "Error: Unable to find MySQL-server-5.1.30-0.glibc23.x86_64.rpm\n" > /dev/stderr
- exit 5
-fi
-
-if [ ! -f jdk-6u13-linux-amd64.rpm.bin ]; then
- printf "Error: Unable to find jdk-6u13-linux-amd64.rpm.bin\n" > /dev/stderr
- exit 6
-fi
-
-#if [ ! -f osol.tar.bz2 ]; then
-# printf "Error: Unable to find osol.tar.bz2\n"
-# exit 7
-#fi
-
-if [ ! -f apache-tomcat-6.0.18.tar.gz ]; then
- printf "Error: Unable to find apache-tomcat-6.0.18.tar.gz\n" > /dev/stderr
- exit 8
-fi
-
-if [ ! -f vmops-*.zip ]; then
- printf "Error: Unable to find vmops install file\n" > /dev/stderr
- exit 9
-fi
-
-if [ ! -f catalina ] ; then
- printf "Error: Unable to find catalina initscript\n" > /dev/stderr
- exit 10
-fi
-
-if [ ! -f usageserver ] ; then
- printf "Error: Unable to find usageserver initscript\n" > /dev/stderr
- exit 11
-fi
-
-###### install Apache
-# if [ ! -d /usr/local/tomcat ] ; then
- echo "installing Apache..."
- mkdir -p /usr/local/tomcat
- tar xfz apache-tomcat-6.0.18.tar.gz -C /usr/local/tomcat
- ln -s /usr/local/tomcat/apache-tomcat-6.0.18 /usr/local/tomcat/current
-# fi
-# if [ ! -f /etc/profile.d/catalinahome.sh ] ; then
-# echo "export CATALINA_HOME=/usr/local/tomcat/current" >> /etc/profile.d/catalinahome.sh
-# fi
-source /etc/profile.d/catalinahome.sh
-# if [ ! -f /etc/init.d/catalina ] ; then
- cp -f catalina /etc/init.d
- /sbin/chkconfig catalina on
-# fi
-
-####### set up usage server as a service
-if [ ! -f /etc/init.d/usageserver ] ; then
- cp -f usageserver /etc/init.d
- /sbin/chkconfig usageserver on
-fi
-
-##### set up mysql
-if rpm -q MySQL-server MySQL-client > /dev/null 2>&1 ; then true ; else
- echo "installing MySQL..."
- yum localinstall --nogpgcheck -y MySQL-*.rpm
-fi
-
-#### install JDK
-echo "installing JDK..."
-sh jdk-6u13-linux-amd64.rpm.bin
-rm -rf /usr/bin/java
-ln -s /usr/java/default/bin/java /usr/bin/java
-
-#### setting up OSOL image
-#mkdir -p $CATALINA_HOME/webapps/images
-#echo "copying Open Solaris image, this may take a few moments..."
-#cp osol.tar.bz2 $CATALINA_HOME/webapps/images
-
-#### deploying database
-unzip -o vmops-*.zip
-cd vmops-*
-sh deploy-server.sh -d "$CATALINA_HOME"
-cd db
-sh deploy-db.sh "../../$1" templates.sql
-
-exit 0
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e392151/build/deploy/production/consoleproxy/conf/consoleproxy.properties
----------------------------------------------------------------------
diff --git a/build/deploy/production/consoleproxy/conf/consoleproxy.properties b/build/deploy/production/consoleproxy/conf/consoleproxy.properties
deleted file mode 100644
index a3cddbc..0000000
--- a/build/deploy/production/consoleproxy/conf/consoleproxy.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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.
-
-consoleproxy.tcpListenPort=0
-consoleproxy.httpListenPort=80
-consoleproxy.httpCmdListenPort=8001
-consoleproxy.jarDir=./applet/
-consoleproxy.viewerLinger=180
-consoleproxy.reconnectMaxRetry=5
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e392151/build/deploy/production/db/server-setup-dev.xml
----------------------------------------------------------------------
diff --git a/build/deploy/production/db/server-setup-dev.xml b/build/deploy/production/db/server-setup-dev.xml
deleted file mode 100644
index 85553d7..0000000
--- a/build/deploy/production/db/server-setup-dev.xml
+++ /dev/null
@@ -1,550 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- 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.
--->
-
-
-<data>
- <version>2.0</version>
- <zones>
- <zone>
- <id>1</id>
- <name>AH</name>
- <dns1>72.52.126.11</dns1>
- <dns2>72.52.126.12</dns2>
- <internalDns1>192.168.10.253</internalDns1>
- <internalDns2>192.168.10.254</internalDns2>
- <vnet>100-199</vnet>
- <guestNetworkCidr>10.1.1.0/24</guestNetworkCidr>
- </zone>
- <zone>
- <id>2</id>
- <name>KM</name>
- <dns1>72.52.126.11</dns1>
- <dns2>72.52.126.12</dns2>
- <internalDns1>192.168.10.253</internalDns1>
- <internalDns2>192.168.10.254</internalDns2>
- <vnet>200-299</vnet>
- <guestNetworkCidr>10.1.1.0/24</guestNetworkCidr>
- </zone>
- <zone>
- <id>3</id>
- <name>KY</name>
- <dns1>72.52.126.11</dns1>
- <dns2>72.52.126.12</dns2>
- <internalDns1>192.168.10.253</internalDns1>
- <internalDns2>192.168.10.254</internalDns2>
- <vnet>300-399</vnet>
- <guestNetworkCidr>10.1.1.0/24</guestNetworkCidr>
- </zone>
- <zone>
- <id>4</id>
- <name>WC</name>
- <dns1>72.52.126.11</dns1>
- <dns2>72.52.126.12</dns2>
- <internalDns1>192.168.10.253</internalDns1>
- <internalDns2>192.168.10.254</internalDns2>
- <vnet>400-499</vnet>
- <guestNetworkCidr>10.1.1.0/24</guestNetworkCidr>
- </zone>
- <zone>
- <id>5</id>
- <name>CV</name>
- <dns1>72.52.126.11</dns1>
- <dns2>72.52.126.12</dns2>
- <internalDns1>192.168.10.253</internalDns1>
- <internalDns2>192.168.10.254</internalDns2>
- <vnet>500-599</vnet>
- <guestNetworkCidr>10.1.1.0/24</guestNetworkCidr>
- </zone>
- <zone>
- <id>6</id>
- <name>KS</name>
- <dns1>72.52.126.11</dns1>
- <dns2>72.52.126.12</dns2>
- <internalDns1>192.168.10.253</internalDns1>
- <internalDns2>192.168.10.254</internalDns2>
- <vnet>600-699</vnet>
- <guestNetworkCidr>10.1.1.0/24</guestNetworkCidr>
- </zone>
- <zone>
- <id>7</id>
- <name>ES</name>
- <dns1>72.52.126.11</dns1>
- <dns2>72.52.126.12</dns2>
- <internalDns1>192.168.10.253</internalDns1>
- <internalDns2>192.168.10.254</internalDns2>
- <vnet>700-799</vnet>
- <guestNetworkCidr>10.1.1.0/24</guestNetworkCidr>
- </zone>
- <zone>
- <id>8</id>
- <name>RC</name>
- <dns1>72.52.126.11</dns1>
- <dns2>72.52.126.12</dns2>
- <internalDns1>192.168.10.253</internalDns1>
- <internalDns2>192.168.10.254</internalDns2>
- <vnet>800-899</vnet>
- <guestNetworkCidr>10.1.1.0/24</guestNetworkCidr>
- </zone>
- <zone>
- <id>9</id>
- <name>AX</name>
- <dns1>72.52.126.11</dns1>
- <dns2>72.52.126.12</dns2>
- <internalDns1>192.168.10.253</internalDns1>
- <internalDns2>192.168.10.254</internalDns2>
- <vnet>900-999</vnet>
- <guestNetworkCidr>10.1.1.0/24</guestNetworkCidr>
- </zone>
- <zone>
- <id>10</id>
- <name>JW</name>
- <dns1>72.52.126.11</dns1>
- <dns2>72.52.126.12</dns2>
- <internalDns1>192.168.10.253</internalDns1>
- <internalDns2>192.168.10.254</internalDns2>
- <vnet>900-999</vnet>
- <guestNetworkCidr>10.1.1.0/24</guestNetworkCidr>
- </zone>
- <zone>
- <id>11</id>
- <name>AJ</name>
- <dns1>72.52.126.11</dns1>
- <dns2>72.52.126.12</dns2>
- <internalDns1>192.168.10.253</internalDns1>
- <internalDns2>192.168.10.254</internalDns2>
- <vnet>1000-1099</vnet>
- <guestNetworkCidr>10.1.1.0/24</guestNetworkCidr>
- </zone>
- </zones>
- <!--
- <storagePools>
- <storagePool>
- <zoneId>5</zoneId>
- <name>sol10-2</name>
- <hostAddress>sol10-2</hostAddress>
- <hostPath>/tank/cloud-nfs/</hostPath>
- </storagePool>
- </storagePools>
- -->
-
- <vlans>
- <vlan>
- <zoneId>1</zoneId>
- <vlanId>31</vlanId>
- <vlanType>VirtualNetwork</vlanType>
- <gateway>192.168.31.1</gateway>
- <netmask>255.255.255.0</netmask>
- <ipAddressRange>192.168.31.150-192.168.31.159</ipAddressRange>
- </vlan>
- <vlan>
- <zoneId>2</zoneId>
- <vlanId>32</vlanId>
- <vlanType>VirtualNetwork</vlanType>
- <gateway>192.168.32.1</gateway>
- <netmask>255.255.255.0</netmask>
- <ipAddressRange>192.168.32.150-192.168.32.159</ipAddressRange>
- </vlan>
- <vlan>
- <zoneId>3</zoneId>
- <vlanId>33</vlanId>
- <vlanType>VirtualNetwork</vlanType>
- <gateway>192.168.33.1</gateway>
- <netmask>255.255.255.0</netmask>
- <ipAddressRange>192.168.33.150-192.168.33.159</ipAddressRange>
- </vlan>
- <vlan>
- <zoneId>4</zoneId>
- <vlanId>34</vlanId>
- <vlanType>VirtualNetwork</vlanType>
- <gateway>192.168.34.1</gateway>
- <netmask>255.255.255.0</netmask>
- <ipAddressRange>192.168.34.150-192.168.34.159</ipAddressRange>
- </vlan>
- <vlan>
- <zoneId>5</zoneId>
- <vlanId>35</vlanId>
- <vlanType>VirtualNetwork</vlanType>
- <gateway>192.168.35.1</gateway>
- <netmask>255.255.255.0</netmask>
- <ipAddressRange>192.168.35.150-192.168.35.159</ipAddressRange>
- </vlan>
- <vlan>
- <zoneId>6</zoneId>
- <vlanId>36</vlanId>
- <vlanType>VirtualNetwork</vlanType>
- <gateway>192.168.36.1</gateway>
- <netmask>255.255.255.0</netmask>
- <ipAddressRange>192.168.36.150-192.168.36.159</ipAddressRange>
- </vlan>
- <vlan>
- <zoneId>7</zoneId>
- <vlanId>37</vlanId>
- <vlanType>VirtualNetwork</vlanType>
- <gateway>192.168.37.1</gateway>
- <netmask>255.255.255.0</netmask>
- <ipAddressRange>192.168.37.150-192.168.37.159</ipAddressRange>
- </vlan>
- <vlan>
- <zoneId>8</zoneId>
- <vlanId>38</vlanId>
- <vlanType>VirtualNetwork</vlanType>
- <gateway>192.168.38.1</gateway>
- <netmask>255.255.255.0</netmask>
- <ipAddressRange>192.168.38.150-192.168.38.159</ipAddressRange>
- </vlan>
- <vlan>
- <zoneId>9</zoneId>
- <vlanId>39</vlanId>
- <vlanType>VirtualNetwork</vlanType>
- <gateway>192.168.39.1</gateway>
- <netmask>255.255.255.0</netmask>
- <ipAddressRange>192.168.39.150-192.168.39.159</ipAddressRange>
- </vlan>
- <vlan>
- <zoneId>10</zoneId>
- <vlanId>40</vlanId>
- <vlanType>VirtualNetwork</vlanType>
- <gateway>192.168.40.1</gateway>
- <netmask>255.255.255.0</netmask>
- <ipAddressRange>192.168.40.150-192.168.40.159</ipAddressRange>
- </vlan>
- <vlan>
- <zoneId>11</zoneId>
- <vlanId>41</vlanId>
- <vlanType>VirtualNetwork</vlanType>
- <gateway>192.168.41.1</gateway>
- <netmask>255.255.255.0</netmask>
- <ipAddressRange>192.168.41.150-192.168.41.159</ipAddressRange>
- </vlan>
- </vlans>
-
- <pods>
- <pod>
- <id>1</id>
- <name>AH</name>
- <zoneId>1</zoneId>
- <ipAddressRange>192.168.10.20-192.168.10.24</ipAddressRange>
- <cidr>192.168.10.0/24</cidr>
- </pod>
- <pod>
- <id>2</id>
- <name>KM</name>
- <zoneId>2</zoneId>
- <ipAddressRange>192.168.10.25-192.168.10.29</ipAddressRange>
- <cidr>192.168.10.0/24</cidr>
- </pod>
- <pod>
- <id>3</id>
- <name>KY</name>
- <zoneId>3</zoneId>
- <ipAddressRange>192.168.10.30-192.168.10.34</ipAddressRange>
- <cidr>192.168.10.0/24</cidr>
- </pod>
- <pod>
- <id>4</id>
- <name>WC</name>
- <zoneId>4</zoneId>
- <ipAddressRange>192.168.10.35-192.168.10.39</ipAddressRange>
- <cidr>192.168.10.0/24</cidr>
- </pod>
- <pod>
- <id>5</id>
- <name>CV</name>
- <zoneId>5</zoneId>
- <ipAddressRange>192.168.10.40-192.168.10.44</ipAddressRange>
- <cidr>192.168.10.0/24</cidr>
- </pod>
- <pod>
- <id>6</id>
- <name>KS</name>
- <zoneId>6</zoneId>
- <ipAddressRange>192.168.10.45-192.168.10.49</ipAddressRange>
- <cidr>192.168.10.0/24</cidr>
- </pod>
- <pod>
- <id>7</id>
- <name>ES</name>
- <zoneId>7</zoneId>
- <ipAddressRange>192.168.10.50-192.168.10.54</ipAddressRange>
- <cidr>192.168.10.0/24</cidr>
- </pod>
- <pod>
- <id>8</id>
- <name>RC</name>
- <zoneId>8</zoneId>
- <ipAddressRange>192.168.10.55-192.168.10.59</ipAddressRange>
- <cidr>192.168.10.0/24</cidr>
- </pod>
- <pod>
- <id>9</id>
- <name>AX</name>
- <zoneId>9</zoneId>
- <ipAddressRange>192.168.10.62-192.168.10.64</ipAddressRange>
- <cidr>192.168.10.0/24</cidr>
- </pod>
- <pod>
- <id>10</id>
- <name>JW</name>
- <zoneId>10</zoneId>
- <ipAddressRange>192.168.10.65-192.168.10.69</ipAddressRange>
- <cidr>192.168.10.0/24</cidr>
- </pod>
- <pod>
- <id>11</id>
- <name>AJ</name>
- <zoneId>11</zoneId>
- <ipAddressRange>192.168.10.70-192.168.10.74</ipAddressRange>
- <cidr>192.168.10.0/24</cidr>
- </pod>
- </pods>
-
- <!--
- * cpu is the number of CPUs for the offering
- * ramSize is total memory in MB
- * speed is the CPU speed for each core in MHZ
- * diskSpace is the storage space in MB
- * price is the price of the offering per hour
- -->
- <serviceOfferings>
- <serviceOffering>
- <id>1</id>
- <name>Small Instance</name>
- <displayText>Small Instance [500MHZ CPU, 512MB MEM, 16GB Disk] - $0.10 per hour</displayText>
- <cpu>1</cpu>
- <ramSize>512</ramSize>
- <speed>500</speed>
- <mirrored>false</mirrored>
- </serviceOffering>
- <serviceOffering>
- <id>2</id>
- <name>Medium Instance</name>
- <displayText>Medium Instance [500MHZ CPU, 1GB MEM, 32GB Disk] - $0.20 per hour</displayText>
- <cpu>1</cpu>
- <ramSize>1024</ramSize>
- <speed>512</speed>
- </serviceOffering>
- <serviceOffering>
- <id>3</id>
- <name>Large Instance</name>
- <displayText>Large Instance [2GHZ CPU, 4GB MEM, 64GB Disk] - $0.30 per hour</displayText>
- <cpu>2</cpu>
- <ramSize>4096</ramSize>
- <speed>2000</speed>
- </serviceOffering>
- </serviceOfferings>
-
- <diskOfferings>
- <diskOffering>
- <id>1</id>
- <domainId>1</domainId>
- <name>Small Disk</name>
- <displayText>Small Disk [16GB Disk]</displayText>
- <diskSpace>16000</diskSpace>
- </diskOffering>
- <diskOffering>
- <id>2</id>
- <domainId>1</domainId>
- <name>Medium Disk</name>
- <displayText>Medium Disk [32GB Disk]</displayText>
- <diskSpace>32000</diskSpace>
- </diskOffering>
- <diskOffering>
- <id>3</id>
- <domainId>1</domainId>
- <name>Large Disk</name>
- <displayText>Large Disk [64GB Disk]</displayText>
- <diskSpace>64000</diskSpace>
- </diskOffering>
- </diskOfferings>
-
- <!--
- * firstname/lastname are optional parameters
- * id, username, password are required parameters
- -->
- <users>
- <user>
- <id>2</id>
- <username>admin</username>
- <password>password</password>
- <firstname>Admin</firstname>
- <lastname>User</lastname>
- <email>admin@mailprovider.com</email>
- </user>
- </users>
-
- <configurationEntries>
- <configuration>
- <name>default.zone</name>
- <value>AH</value>
- </configuration>
- <configuration>
- <name>domain.suffix</name>
- <value>cloud-test.cloud.com</value>
- </configuration>
- <configuration>
- <name>instance.name</name>
- <value>AH</value>
- </configuration>
- <configuration>
- <name>consoleproxy.ram.size</name>
- <value>256</value>
- </configuration>
- <configuration>
- <name>host.stats.interval</name>
- <value>3600000</value>
- </configuration>
- <configuration>
- <name>storage.stats.interval</name>
- <value>120000</value>
- </configuration>
- <configuration>
- <name>volume.stats.interval</name>
- <value>-1</value>
- </configuration>
- <configuration>
- <name>ping.interval</name>
- <value>60</value>
- </configuration>
- <configuration>
- <name>alert.wait</name>
- <value>1800</value>
- </configuration>
- <configuration>
- <name>expunge.interval</name>
- <value>86400</value>
- </configuration>
- <configuration>
- <name>usage.aggregation.timezone</name>
- <value>GMT</value>
- </configuration>
- <!-- RSA Keys -->
- <configuration>
- <name>ssh.privatekey</name>
- <value>-----BEGIN RSA PRIVATE KEY-----\nMIIEoQIBAAKCAQEAnNUMVgQS87EzAQN9ufGgH3T1kOpqcvTmUrp8RVZyeA5qwptS\nrZxONRbhLK709pZFBJLmeFqiqciWoA/srVIFk+rPmBlVsMw8BK53hTGoax7iSe8s\nLFCAATm6vp0HnZzYqNfrzR2by36ET5aQD/VAyA55u+uUgAlxQuhKff2xjyahEHs+\nUiRlReiAgItygm9g3co3+8fJDOuRse+s0TOip1D0jPdo2AJFscyxrG9hWqQH86R/\nZlLJ7DqsiaAcUmn52u6Nsmd3BkRmGVx/D35Mq6upJqrk/QDfug9LF66yiIP/BEIn\n08N/wQ6m/O37WUtqqyl3rRKqs5TJ9ZnhsqeO9QIBIwKCAQA6QIDsv69EkkYk8qsK\njPJU06uq2rnS7T+bEhDmjdK+4MiRbOQx2vh6HnDktgM3BJ1K13oss/NGYHJ190lH\nsMA+QUXKx5TbRItSMixkrAta/Ne1D7FSScklBtBVbYZ8XtQhdMVML5GjWuCv2NZs\nU8eaw4xNHPyklcr7mBurI7b6p13VK5BNUWR/VNuigT4U89YzRcoEZ/sTlR+4ACYr\nxbUJJGBA03+NhdSAe2vodlMh5lGflD0JmHMFqqg9BcAtVb73JsOsxFQArbXwRd/q\nNckdoAvgJfhTOvXF5GMPLI0lGb6skJkS229F4GaBB2Iz4A9O0aHZob8I8zsWUbiu\npvBrAoGBAMjUDfF2x13NjH1cFHietO5O1oM0nZaAxKodxoAUvHVMUd5DIY50tqYw\n7ecKi2Cw43ONpdj0nP9Nc2NV3NDRqLopwkKUsTtq9AKQ2cIuw3+uS5vm0VZBzmTP\nuF04Qo4bXh/jFRA62u9bXsmIFtaehKxE1Gp6zi393GcbWP4HX/3dAoGBAMfq0KD3\ngeU1PHi9uI3Ss89nXzJsiGcwC5Iunu
1aTzJCYhMlJkfmRcXYMAqSfg0nGWnfvlDh\nuOO26CHKjG182mTwYXdgQzIPpBc8suvgUWDBTrIzJI+zuyBLtPbd9DJEVrZkRVQX\nXrOV3Y5oOWsba4F+b20jaaHFAiY7s6OtrX/5AoGBAMMXI3zZyPwJgSlSIoPNX03m\nL3gke9QID4CvNduB26UlkVuRq5GzNRZ4rJdMEl3tqcC1fImdKswfWiX7o06ChqY3\nMb0FePfkPX7V2tnkSOJuzRsavLoxTCdqsxi6T0g318c0XZq81K4A/P5Jr8ksRl40\nPA+qfyVdAf3Cy3ptkHLzAoGASkFGLSi7N+CSzcLPhSJgCzUGGgsOF7LCeB/x4yGL\nIUvbSPCKj7vuB6gR2AqGlyvHnFprQpz7h8eYDI0PlmGS8kqn2+HtEpgYYGcAoMEI\nSIJQbhL+84vmaxTOL87IanEnhZL1LdzLZ0ZK+mE55fQ936P9gE77WVfNmSweJtob\n3xMCgYAl0aLeGf4oUZbI56eEaCbu8U7dEe6MF54VbozyiXqbp455QnUpuBrRn5uf\nc079dNcqTNDuk1+hYX9qNn1aXsvWeuofBXqWoFXu/c4yoWxJAPhEVhzZ9xrXI76I\nBKiPCyKrOa7bSLvs6SQPpuf5AQ8+NJrOxkEB9hbMuaAr2N5rCw==\n-----END RSA PRIVATE KEY-----
- </value>
- <category>Hidden</category>
- </configuration>
- <configuration>
- <name>ssh.publickey</name>
- <value>
- ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAnNUMVgQS87EzAQN9ufGgH3T1kOpqcvTmUrp8RVZyeA5qwptSrZxONRbhLK709pZFBJLmeFqiqciWoA/srVIFk+rPmBlVsMw8BK53hTGoax7iSe8sLFCAATm6vp0HnZzYqNfrzR2by36ET5aQD/VAyA55u+uUgAlxQuhKff2xjyahEHs+UiRlReiAgItygm9g3co3+8fJDOuRse+s0TOip1D0jPdo2AJFscyxrG9hWqQH86R/ZlLJ7DqsiaAcUmn52u6Nsmd3BkRmGVx/D35Mq6upJqrk/QDfug9LF66yiIP/BEIn08N/wQ6m/O37WUtqqyl3rRKqs5TJ9ZnhsqeO9Q== root@test2.lab.vmops.com
- </value>
- <category>Hidden</category>
- </configuration>
- <!-- the following are for configuring alerts and need to be changed to proper configuration values -->
- <!--
- <configuration>
- <name>alert.smtp.host</name>
- <value>smtp.host.com</value>
- </configuration>
- <configuration>
- <name>alert.smtp.port</name>
- <value>25</value>
- </configuration>
- <configuration>
- <name>alert.smtp.useAuth</name>
- <value>false</value>
- </configuration>
- <configuration>
- <name>alert.smtp.username</name>
- <value>some.user@example.com</value>
- </configuration>
- <configuration>
- <name>alert.smtp.password</name>
- <value>password</value>
- </configuration>
- <configuration>
- <name>alert.email.sender</name>
- <value>some.user@example.com</value>
- </configuration>
- <configuration>
- <name>alert.email.addresses</name>
- <value>some.admin@example.com</value>
- </configuration>
- <configuration>
- <name>alert.smtp.debug</name>
- <value>false</value>
- </configuration>
- -->
- <configuration>
- <name>memory.capacity.threshold</name>
- <value>0.85</value>
- </configuration>
- <configuration>
- <name>cpu.capacity.threshold</name>
- <value>0.85</value>
- </configuration>
- <configuration>
- <name>storage.capacity.threshold</name>
- <value>0.85</value>
- </configuration>
- <configuration>
- <name>storage.allocated.capacity.threshold</name>
- <value>0.85</value>
- </configuration>
- <configuration>
- <name>capacity.check.period</name>
- <value>3600000</value>
- </configuration>
- <configuration>
- <name>wait</name>
- <value>240</value>
- </configuration>
- <configuration>
- <name>network.throttling.rate</name>
- <value>200</value>
- </configuration>
- <configuration>
- <name>multicast.throttling.rate</name>
- <value>10</value>
- </configuration>
-</configurationEntries>
-
- <!--
- It is possible to specify a single IP address. For example, to add 192.168.1.1
- as the only address, specify as follows.
- <publicIpAddresses>
- <zoneId>1</zoneId>
- <ipAddressRange>192.168.1.1</ipAddressRange>
- </publicIpAddresses>
-
- For each ip address range, create a new object. For example, to add the range 192.168.2.1 to 192.168.2.255
- copy the following object tag into the privateIpRange
- <privateIpAddresses>
- <zoneId>1</zoneId>
- <podId>1</podId>
- <ipAddressRange>192.168.2.1-192.168.2.255</ipAddressRange>
- </privateIpAddresses>
- -->
-
- <!--
- It is possible to specify a single IP address. For example, to add 65.37.141.29
- as the only address, specify as follows.
- <publicIpAddresses>
- <zoneId>1</zoneId>
- <ipAddressRange>65.37.141.29</ipAddressRange>
- </publicIpAddresses>
-
- For each ip address range, create a new object. For example, to add the range 65.37.141.29 to 65.37.141.39
- copy the following object tag into the publicIpRange
- <publicIpAddresses>
- <zoneId>1</zoneId>
- <ipAddressRange>65.37.141.29-65.37.141.39</ipAddressRange>
- </publicIpAddresses>
- -->
-</data>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e392151/build/deploy/production/db/templates-dev.sql
----------------------------------------------------------------------
diff --git a/build/deploy/production/db/templates-dev.sql b/build/deploy/production/db/templates-dev.sql
deleted file mode 100644
index c1ec7a3..0000000
--- a/build/deploy/production/db/templates-dev.sql
+++ /dev/null
@@ -1,30 +0,0 @@
--- 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.
-INSERT INTO `vmops`.`vm_template` (id, unique_name, name, public, path, created, type, hvm, bits, created_by, url, checksum, ready, display_text, enable_password)
- VALUES (1, 'routing', 'DomR Template', 0, 'tank/volumes/demo/template/private/u000000/os/routing', now(), 'ext3', 0, 64, 1, 'http://vmopsserver.lab.vmops.com/images/routing/vmi-root-fc8-x86_64-domR.img.bz2', 'd00927f863a23b98cc6df6e377c9d0c6', 0, 'DomR Template', 0);
-INSERT INTO `vmops`.`vm_template` (id, unique_name, name, public, path, created, type, hvm, bits, created_by, url, checksum, ready, display_text, enable_password)
- VALUES (3, 'centos53-x86_64', 'Centos 5.3(x86_64) no GUI', 1, 'tank/volumes/demo/template/public/os/centos53-x86_64', now(), 'ext3', 0, 64, 1, 'http://vmopsserver.lab.vmops.com/images/centos52-x86_64/vmi-root-centos.5-2.64.pv.img.gz', 'd4ca80825d936db00eedf26620f13d69', 0, 'Centos 5.3(x86_64) no GUI', 0);
-#INSERT INTO `vmops`.`vm_template` (id, unique_name, name, public, path, created, type, hvm, bits, created_by, url, checksum, ready, display_text, enable_password)
-# VALUES (4, 'centos52-x86_64-gui', 'Centos 5.2(x86_64) GUI', 1, 'tank/volumes/demo/template/public/os/centos52-x86_64-gui', now(), 'ext3', 0, 64, 1, 'http://vmopsserver.lab.vmops.com/images/centos52-x86_64/vmi-root-centos.5-2.64.pv.img.gz', 'd4ca80825d936db00eedf26620f13d69', 0, 'Centos 5.2(x86_64) GUI', 0);
-INSERT INTO `vmops`.`vm_template` (id, unique_name, name, public, path, created, type, hvm, bits, created_by, url, checksum, ready, display_text, enable_password)
- VALUES (5, 'winxpsp3', 'Windows XP SP3 (32-bit)', 1, 'tank/volumes/demo/template/public/os/winxpsp3', now(), 'ntfs', 1, 32, 1, 'http://vmopsserver.lab.vmops.com/images/fedora10-x86_64/vmi-root-fedora10.64.img.gz', 'c76d42703f14108b15acc9983307c759', 0, 'Windows XP SP3 (32-bit)', 0);
-INSERT INTO `vmops`.`vm_template` (id, unique_name, name, public, path, created, type, hvm, bits, created_by, url, checksum, ready, display_text, enable_password)
- VALUES (7, 'win2003sp2', 'Windows 2003 SP2 (32-bit)', 1, 'tank/volumes/demo/template/public/os/win2003sp2', now(), 'ntfs', 1, 32, 1, 'http://vmopsserver.lab.vmops.com/images/win2003sp2/vmi-root-win2003sp2.img.gz', '4d2cc51898d05c0f7a2852c15bcdc77b', 0, 'Windows 2003 SP2 (32-bit)', 0);
-INSERT INTO `vmops`.`vm_template` (id, unique_name, name, public, path, created, type, hvm, bits, created_by, url, checksum, ready, display_text, enable_password)
- VALUES (8, 'win2003sp2-x64', 'Windows 2003 SP2 (64-bit)', 1, 'tank/volumes/demo/template/public/os/win2003sp2-x64', now(), 'ntfs', 1, 64, 1, 'http://vmopsserver.lab.vmops.com/images/win2003sp2-x86_64/vmi-root-win2003sp2-x64.img.gz', '35d4de1c38eb4fb9d81a31c1d989c482', 0, 'Windows 2003 SP2 (64-bit)', 0);
-INSERT INTO `vmops`.`vm_template` (id, unique_name, name, public, path, created, type, hvm, bits, created_by, url, checksum, ready, display_text, enable_password)
- VALUES (9, 'fedora12-GUI-x86_64', 'Fedora 12 Desktop(64-bit)', 1, 'tank/volumes/demo/template/public/os/fedora12-GUI-x86_64', now(), 'ext3', 1, 64, 1, 'http://vmopsserver.lab.vmops.com/images/fedora12-GUI-x86_64/vmi-root-fedora12-GUI-x86_64.qcow2.gz', '', 0, 'Fedora 12 Desktop (with httpd,java and mysql)', 0);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e392151/build/deploy/production/premium/conf/log4j-cloud_usage.xml
----------------------------------------------------------------------
diff --git a/build/deploy/production/premium/conf/log4j-cloud_usage.xml b/build/deploy/production/premium/conf/log4j-cloud_usage.xml
deleted file mode 100644
index f7e1c2e..0000000
--- a/build/deploy/production/premium/conf/log4j-cloud_usage.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<!--
- 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.
--->
-
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-
- <!-- ============================== -->
- <!-- Append messages to the console -->
- <!-- ============================== -->
-
- <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
- <param name="Target" value="System.out"/>
- <param name="Threshold" value="INFO"/>
-
- <layout class="org.apache.log4j.EnhancedPatternLayout">
- <param name="ConversionPattern" value="%d{ABSOLUTE}{GMT} %5p %c{1}:%L - %m%n"/>
- </layout>
- </appender>
-
- <!-- ================================ -->
- <!-- Append messages to the usage log -->
- <!-- ================================ -->
-
- <!-- A time/date based rolling appender -->
- <appender name="USAGE" class="org.apache.log4j.rolling.RollingFileAppender">
- <param name="Append" value="true"/>
- <param name="Threshold" value="DEBUG"/>
- <rollingPolicy class="org.apache.log4j.rolling.TimeBasedRollingPolicy">
- <param name="FileNamePattern" value="/var/log/cloud/cloud_usage.log.%d{yyyy-MM-dd}{GMT}.gz"/>
- <param name="ActiveFileName" value="/var/log/cloud/cloud_usage.log"/>
- </rollingPolicy>
-
- <layout class="org.apache.log4j.EnhancedPatternLayout">
- <param name="ConversionPattern" value="%d{ISO8601}{GMT} %-5p [%c{3}] (%t:%x) %m%n"/>
- </layout>
- </appender>
-
- <!-- ================ -->
- <!-- Limit categories -->
- <!-- ================ -->
-
- <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="INFO"/>
- </category>
-
- <category name="org">
- <priority value="INFO"/>
- </category>
-
- <category name="net">
- <priority value="INFO"/>
- </category>
-
- <!-- ======================= -->
- <!-- Setup the Root category -->
- <!-- ======================= -->
-
- <root>
- <level value="INFO"/>
- <appender-ref ref="CONSOLE"/>
- <appender-ref ref="USAGE"/>
- </root>
-
-</log4j:configuration>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e392151/build/deploy/production/premium/conf/log4j-cloud_usage.xml.template
----------------------------------------------------------------------
diff --git a/build/deploy/production/premium/conf/log4j-cloud_usage.xml.template b/build/deploy/production/premium/conf/log4j-cloud_usage.xml.template
deleted file mode 100644
index 64d4261..0000000
--- a/build/deploy/production/premium/conf/log4j-cloud_usage.xml.template
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<!--
- 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.
--->
-
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-
- <!-- ============================== -->
- <!-- Append messages to the console -->
- <!-- ============================== -->
-
- <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
- <param name="Target" value="System.out"/>
- <param name="Threshold" value="INFO"/>
-
- <layout class="org.apache.log4j.EnhancedPatternLayout">
- <param name="ConversionPattern" value="%d{ABSOLUTE}{GMT} %5p %c{1}:%L - %m%n"/>
- </layout>
- </appender>
-
- <!-- ================================ -->
- <!-- Append messages to the usage log -->
- <!-- ================================ -->
-
- <!-- A time/date based rolling appender -->
- <appender name="USAGE" class="org.apache.log4j.rolling.RollingFileAppender">
- <param name="Append" value="true"/>
- <param name="Threshold" value="DEBUG"/>
- <rollingPolicy class="org.apache.log4j.rolling.TimeBasedRollingPolicy">
- <param name="FileNamePattern" value="@logdir@/cloud_usage.log.%d{yyyy-MM-dd}{GMT}.gz"/>
- <param name="ActiveFileName" value="@logdir@/cloud_usage.log"/>
- </rollingPolicy>
-
- <layout class="org.apache.log4j.EnhancedPatternLayout">
- <param name="ConversionPattern" value="%d{ISO8601}{GMT} %-5p [%c{3}] (%t:%x) %m%n"/>
- </layout>
- </appender>
-
- <!-- ================ -->
- <!-- Limit categories -->
- <!-- ================ -->
-
- <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="INFO"/>
- </category>
-
- <category name="org">
- <priority value="INFO"/>
- </category>
-
- <category name="net">
- <priority value="INFO"/>
- </category>
-
- <!-- ======================= -->
- <!-- Setup the Root category -->
- <!-- ======================= -->
-
- <root>
- <level value="INFO"/>
- <appender-ref ref="CONSOLE"/>
- <appender-ref ref="USAGE"/>
- </root>
-
-</log4j:configuration>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e392151/build/deploy/production/premium/conf/usage-components.xml
----------------------------------------------------------------------
diff --git a/build/deploy/production/premium/conf/usage-components.xml b/build/deploy/production/premium/conf/usage-components.xml
deleted file mode 100644
index 02c9d1b..0000000
--- a/build/deploy/production/premium/conf/usage-components.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0"?>
-<!--
- 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.
--->
-
-
-<!--
- usage-components.xml is the configuration file for the VM Ops
- usage servers.
-
- Here are some places to look for information.
- - To find out the general functionality that each Manager
- or Adapter provide, look at the javadoc for the interface
- that it implements. The interface is usually the
- "key" attribute in the declaration.
- - To find specific implementation of each Manager or
- Adapter, look at the javadoc for the actual class. The
- class can be found in the <class> element.
- - To find out the configuration parameters for each Manager
- or Adapter, look at the javadoc for the actual implementation
- class. It should be documented in the description of the
- class.
- - To know more about the components.xml in general, look for
- the javadoc for ComponentLocator.java.
-
- If you found that the Manager or Adapter are not properly
- documented, please contact the author.
--->
-<components.xml>
- <usage-server>
- <dao name="VM Instance" class="com.cloud.vm.dao.VMInstanceDaoImpl"/>
- <dao name="User VM" class="com.cloud.vm.dao.UserVmDaoImpl"/>
- <dao name="ServiceOffering" class="com.cloud.service.dao.ServiceOfferingDaoImpl">
- <param name="cache.size">50</param>
- <param name="cache.time.to.live">-1</param>
- </dao>
- <dao name="UserStats" class="com.cloud.user.dao.UserStatisticsDaoImpl"/>
- <dao name="IP Addresses" class="com.cloud.network.dao.IPAddressDaoImpl"/>
- <dao name="Usage" class="com.cloud.usage.dao.UsageDaoImpl"/>
- <dao name="Domain" class="com.cloud.domain.dao.DomainDaoImpl"/>
- <dao name="Account" class="com.cloud.user.dao.AccountDaoImpl"/>
- <dao name="UserAccount" class="com.cloud.user.dao.UserAccountDaoImpl"/>
- <dao name="Usage VmInstance" class="com.cloud.usage.dao.UsageVMInstanceDaoImpl"/>
- <dao name="Usage Network" class="com.cloud.usage.dao.UsageNetworkDaoImpl"/>
- <dao name="Usage IPAddress" class="com.cloud.usage.dao.UsageIPAddressDaoImpl"/>
- <dao name="Usage Job" class="com.cloud.usage.dao.UsageJobDaoImpl"/>
- <dao name="Configuration" class="com.cloud.configuration.dao.ConfigurationDaoImpl"/>
- <dao name="Usage Event" class="com.cloud.event.dao.UsageEventDaoImpl"/>
- <manager name="Usage alert manager" class="com.cloud.usage.UsageAlertManagerImpl"/>
- <manager name="usage manager" class="com.cloud.usage.UsageManagerImpl">
- <param name="period">DAILY</param> <!-- DAILY, WEEKLY, MONTHLY; how often it creates usage records -->
- </manager>
- </usage-server>
-</components.xml>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e392151/build/deploy/production/server/conf/agent-update.properties
----------------------------------------------------------------------
diff --git a/build/deploy/production/server/conf/agent-update.properties b/build/deploy/production/server/conf/agent-update.properties
deleted file mode 100644
index 2238fa7..0000000
--- a/build/deploy/production/server/conf/agent-update.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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.
-
-agent.minimal.version=@agent.min.version@
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e392151/build/deploy/production/server/conf/cloud-localhost.pk12
----------------------------------------------------------------------
diff --git a/build/deploy/production/server/conf/cloud-localhost.pk12 b/build/deploy/production/server/conf/cloud-localhost.pk12
deleted file mode 100644
index 79dfc4d..0000000
Binary files a/build/deploy/production/server/conf/cloud-localhost.pk12 and /dev/null differ