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/08/01 22:57:59 UTC
git commit: remove the unused files
Updated Branches:
refs/heads/master 99b0ea7b1 -> 3a184a1b4
remove the unused files
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/3a184a1b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/3a184a1b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/3a184a1b
Branch: refs/heads/master
Commit: 3a184a1b497e8eee8f4c003db68fdb2033182f3a
Parents: 99b0ea7
Author: Edison Su <su...@gmail.com>
Authored: Wed Aug 1 13:57:33 2012 -0700
Committer: Edison Su <su...@gmail.com>
Committed: Wed Aug 1 13:57:33 2012 -0700
----------------------------------------------------------------------
.../agent/storagehdpatch/etc/default/init | 38 ----
.../agent/storagehdpatch/etc/inet/ntp.conf | 23 ---
.../agent/storagehdpatch/etc/nsswitch.conf | 70 -------
.../agent/storagehdpatch/etc/ssh/sshd_config | 154 ---------------
.../production/agent/storagehdpatch/etc/system | 101 ----------
.../storagehdpatch/etc/vmops/disks.properties | 23 ---
.../storagehdpatch/etc/vmops/network.properties | 51 -----
.../agent/storagehdpatch/lib/svc/method/vmops | 121 -----------
.../agent/storagehdpatch/usr/sbin/vsetup | 59 ------
.../var/svc/manifest/application/cloud.xml | 60 ------
10 files changed, 0 insertions(+), 700 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3a184a1b/build/deploy/production/agent/storagehdpatch/etc/default/init
----------------------------------------------------------------------
diff --git a/build/deploy/production/agent/storagehdpatch/etc/default/init b/build/deploy/production/agent/storagehdpatch/etc/default/init
deleted file mode 100644
index 4ae3476..0000000
--- a/build/deploy/production/agent/storagehdpatch/etc/default/init
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# This file is /etc/default/init. /etc/TIMEZONE is a symlink to this file.
-# This file looks like a shell script, but it is not. To maintain
-# compatibility with old versions of /etc/TIMEZONE, some shell constructs
-# (i.e., export commands) are allowed in this file, but are ignored.
-#
-# Lines of this file should be of the form VAR=value, where VAR is one of
-# TZ, LANG, CMASK, or any of the LC_* environment variables. value may
-# be enclosed in double quotes (") or single quotes (').
-#
-TZ=GMT
-CMASK=022
-LANG=en_US.UTF-8
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3a184a1b/build/deploy/production/agent/storagehdpatch/etc/inet/ntp.conf
----------------------------------------------------------------------
diff --git a/build/deploy/production/agent/storagehdpatch/etc/inet/ntp.conf b/build/deploy/production/agent/storagehdpatch/etc/inet/ntp.conf
deleted file mode 100644
index 396f791..0000000
--- a/build/deploy/production/agent/storagehdpatch/etc/inet/ntp.conf
+++ /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.
-
-driftfile /var/lib/ntp/ntp.drift
-
-server 0.pool.ntp.org
-server 1.pool.ntp.org
-server 2.pool.ntp.org
-server 3.pool.ntp.org
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3a184a1b/build/deploy/production/agent/storagehdpatch/etc/nsswitch.conf
----------------------------------------------------------------------
diff --git a/build/deploy/production/agent/storagehdpatch/etc/nsswitch.conf b/build/deploy/production/agent/storagehdpatch/etc/nsswitch.conf
deleted file mode 100644
index 918d8f3..0000000
--- a/build/deploy/production/agent/storagehdpatch/etc/nsswitch.conf
+++ /dev/null
@@ -1,70 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "%Z%%M% %I% %E% SMI"
-
-#
-# /etc/nsswitch.dns:
-#
-# An example file that could be copied over to /etc/nsswitch.conf; it uses
-# DNS for hosts lookups, otherwise it does not use any other naming service.
-#
-# "hosts:" and "services:" in this file are used only if the
-# /etc/netconfig file has a "-" for nametoaddr_libs of "inet" transports.
-
-# DNS service expects that an instance of svc:/network/dns/client be
-# enabled and online.
-
-passwd: files
-group: files
-
-# You must also set up the /etc/resolv.conf file for DNS name
-# server lookup. See resolv.conf(4). For lookup via mdns
-# svc:/network/dns/multicast:default must also be enabled. See mdnsd(1M)
-hosts: files dns
-
-# Note that IPv4 addresses are searched for in all of the ipnodes databases
-# before searching the hosts databases.
-ipnodes: files dns
-
-networks: files
-protocols: files
-rpc: files
-ethers: files
-netmasks: files
-bootparams: files
-publickey: files
-# At present there isn't a 'files' backend for netgroup; the system will
-# figure it out pretty quickly, and won't use netgroups at all.
-netgroup: files
-automount: files
-aliases: files
-services: files
-printers: user files
-
-auth_attr: files
-prof_attr: files
-project: files
-
-tnrhtp: files
-tnrhdb: files
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3a184a1b/build/deploy/production/agent/storagehdpatch/etc/ssh/sshd_config
----------------------------------------------------------------------
diff --git a/build/deploy/production/agent/storagehdpatch/etc/ssh/sshd_config b/build/deploy/production/agent/storagehdpatch/etc/ssh/sshd_config
deleted file mode 100644
index 2eb6853..0000000
--- a/build/deploy/production/agent/storagehdpatch/etc/ssh/sshd_config
+++ /dev/null
@@ -1,154 +0,0 @@
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# Configuration file for sshd(1m)
-
-# Protocol versions supported
-#
-# The sshd shipped in this release of Solaris has support for major versions
-# 1 and 2. It is recommended due to security weaknesses in the v1 protocol
-# that sites run only v2 if possible. Support for v1 is provided to help sites
-# with existing ssh v1 clients/servers to transition.
-# Support for v1 may not be available in a future release of Solaris.
-#
-# To enable support for v1 an RSA1 key must be created with ssh-keygen(1).
-# RSA and DSA keys for protocol v2 are created by /etc/init.d/sshd if they
-# do not already exist, RSA1 keys for protocol v1 are not automatically created.
-
-# Uncomment ONLY ONE of the following Protocol statements.
-
-# Only v2 (recommended)
-Protocol 2
-
-# Both v1 and v2 (not recommended)
-#Protocol 2,1
-
-# Only v1 (not recommended)
-#Protocol 1
-
-# Listen port (the IANA registered port number for ssh is 22)
-Port 22
-
-# The default listen address is all interfaces, this may need to be changed
-# if you wish to restrict the interfaces sshd listens on for a multi homed host.
-# Multiple ListenAddress entries are allowed.
-
-# IPv4 only
-#ListenAddress 0.0.0.0
-# IPv4 & IPv6
-ListenAddress ::
-
-# Port forwarding
-AllowTcpForwarding no
-
-# If port forwarding is enabled, specify if the server can bind to INADDR_ANY.
-# This allows the local port forwarding to work when connections are received
-# from any remote host.
-GatewayPorts no
-
-# X11 tunneling options
-X11Forwarding yes
-X11DisplayOffset 10
-X11UseLocalhost yes
-
-# The maximum number of concurrent unauthenticated connections to sshd.
-# start:rate:full see sshd(1) for more information.
-# The default is 10 unauthenticated clients.
-#MaxStartups 10:30:60
-
-# Banner to be printed before authentication starts.
-#Banner /etc/issue
-
-# Should sshd print the /etc/motd file and check for mail.
-# On Solaris it is assumed that the login shell will do these (eg /etc/profile).
-PrintMotd no
-
-# KeepAlive specifies whether keep alive messages are sent to the client.
-# See sshd(1) for detailed description of what this means.
-# Note that the client may also be sending keep alive messages to the server.
-KeepAlive yes
-
-# Syslog facility and level
-SyslogFacility auth
-LogLevel info
-
-#
-# Authentication configuration
-#
-
-# Host private key files
-# Must be on a local disk and readable only by the root user (root:sys 600).
-HostKey /etc/ssh/ssh_host_rsa_key
-HostKey /etc/ssh/ssh_host_dsa_key
-
-# Length of the server key
-# Default 768, Minimum 512
-ServerKeyBits 768
-
-# sshd regenerates the key every KeyRegenerationInterval seconds.
-# The key is never stored anywhere except the memory of sshd.
-# The default is 1 hour (3600 seconds).
-KeyRegenerationInterval 3600
-
-# Ensure secure permissions on users .ssh directory.
-StrictModes yes
-
-# Length of time in seconds before a client that hasn't completed
-# authentication is disconnected.
-# Default is 600 seconds. 0 means no time limit.
-LoginGraceTime 600
-
-# Maximum number of retries for authentication
-# Default is 6. Default (if unset) for MaxAuthTriesLog is MaxAuthTries / 2
-MaxAuthTries 6
-MaxAuthTriesLog 3
-
-# Are logins to accounts with empty passwords allowed.
-# If PermitEmptyPasswords is no, pass PAM_DISALLOW_NULL_AUTHTOK
-# to pam_authenticate(3PAM).
-PermitEmptyPasswords no
-
-# To disable tunneled clear text passwords, change PasswordAuthentication to no.
-PasswordAuthentication yes
-
-# Use PAM via keyboard interactive method for authentication.
-# Depending on the setup of pam.conf(4) this may allow tunneled clear text
-# passwords even when PasswordAuthentication is set to no. This is dependent
-# on what the individual modules request and is out of the control of sshd
-# or the protocol.
-PAMAuthenticationViaKBDInt yes
-
-# Are root logins permitted using sshd.
-# Note that sshd uses pam_authenticate(3PAM) so the root (or any other) user
-# maybe denied access by a PAM module regardless of this setting.
-# Valid options are yes, without-password, no.
-PermitRootLogin yes
-
-# sftp subsystem
-Subsystem sftp /usr/lib/ssh/sftp-server
-
-
-# SSH protocol v1 specific options
-#
-# The following options only apply to the v1 protocol and provide
-# some form of backwards compatibility with the very weak security
-# of /usr/bin/rsh. Their use is not recommended and the functionality
-# will be removed when support for v1 protocol is removed.
-
-# Should sshd use .rhosts and .shosts for password less authentication.
-IgnoreRhosts yes
-RhostsAuthentication no
-
-# Rhosts RSA Authentication
-# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts.
-# If the user on the client side is not root then this won't work on
-# Solaris since /usr/bin/ssh is not installed setuid.
-RhostsRSAAuthentication no
-
-# Uncomment if you don't trust ~/.ssh/known_hosts for RhostsRSAAuthentication.
-#IgnoreUserKnownHosts yes
-
-# Is pure RSA authentication allowed.
-# Default is yes
-RSAAuthentication yes
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3a184a1b/build/deploy/production/agent/storagehdpatch/etc/system
----------------------------------------------------------------------
diff --git a/build/deploy/production/agent/storagehdpatch/etc/system b/build/deploy/production/agent/storagehdpatch/etc/system
deleted file mode 100644
index 0ede115..0000000
--- a/build/deploy/production/agent/storagehdpatch/etc/system
+++ /dev/null
@@ -1,101 +0,0 @@
-*ident "%Z%%M% %I% %E% SMI" /* SVR4 1.5 */
-*
-* CDDL HEADER START
-*
-* The contents of this file are subject to the terms of the
-* Common Development and Distribution License, Version 1.0 only
-* (the "License"). You may not use this file except in compliance
-* with the License.
-*
-* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-* or http://www.opensolaris.org/os/licensing.
-* See the License for the specific language governing permissions
-* and limitations under the License.
-*
-* When distributing Covered Code, include this CDDL HEADER in each
-* file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-* If applicable, add the following below this CDDL HEADER, with the
-* fields enclosed by brackets "[]" replaced with your own identifying
-* information: Portions Copyright [yyyy] [name of copyright owner]
-*
-* CDDL HEADER END
-*
-*
-* SYSTEM SPECIFICATION FILE
-*
-
-* moddir:
-*
-* Set the search path for modules. This has a format similar to the
-* csh path variable. If the module isn't found in the first directory
-* it tries the second and so on. The default is /kernel /usr/kernel
-*
-* Example:
-* moddir: /kernel /usr/kernel /other/modules
-
-
-
-* root device and root filesystem configuration:
-*
-* The following may be used to override the defaults provided by
-* the boot program:
-*
-* rootfs: Set the filesystem type of the root.
-*
-* rootdev: Set the root device. This should be a fully
-* expanded physical pathname. The default is the
-* physical pathname of the device where the boot
-* program resides. The physical pathname is
-* highly platform and configuration dependent.
-*
-* Example:
-* rootfs:ufs
-* rootdev:/sbus@1,f8000000/esp@0,800000/sd@3,0:a
-*
-* (Swap device configuration should be specified in /etc/vfstab.)
-
-
-
-* exclude:
-*
-* Modules appearing in the moddir path which are NOT to be loaded,
-* even if referenced. Note that `exclude' accepts either a module name,
-* or a filename which includes the directory.
-*
-* Examples:
-* exclude: win
-* exclude: sys/shmsys
-
-
-
-* forceload:
-*
-* Cause these modules to be loaded at boot time, (just before mounting
-* the root filesystem) rather than at first reference. Note that
-* forceload expects a filename which includes the directory. Also
-* note that loading a module does not necessarily imply that it will
-* be installed.
-*
-* Example:
-* forceload: drv/foo
-
-
-
-* set:
-*
-* Set an integer variable in the kernel or a module to a new value.
-* This facility should be used with caution. See system(4).
-*
-* Examples:
-*
-* To set variables in 'unix':
-*
-* set nautopush=32
-* set maxusers=40
-*
-* To set a variable named 'debug' in the module named 'test_module'
-*
-* set test_module:debug = 0x13
-
-* set zfs:zfs_arc_max=0x4002000
-set zfs:zfs_vdev_cache_size=0
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3a184a1b/build/deploy/production/agent/storagehdpatch/etc/vmops/disks.properties
----------------------------------------------------------------------
diff --git a/build/deploy/production/agent/storagehdpatch/etc/vmops/disks.properties b/build/deploy/production/agent/storagehdpatch/etc/vmops/disks.properties
deleted file mode 100644
index 42f2977..0000000
--- a/build/deploy/production/agent/storagehdpatch/etc/vmops/disks.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.
-
-# Specify disks in this file
-# D: Data
-# C: Cache
-# L: Intent Log
-# S: Spare
-# U: Unused
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3a184a1b/build/deploy/production/agent/storagehdpatch/etc/vmops/network.properties
----------------------------------------------------------------------
diff --git a/build/deploy/production/agent/storagehdpatch/etc/vmops/network.properties b/build/deploy/production/agent/storagehdpatch/etc/vmops/network.properties
deleted file mode 100644
index f8dcd54..0000000
--- a/build/deploy/production/agent/storagehdpatch/etc/vmops/network.properties
+++ /dev/null
@@ -1,51 +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.
-
-# Host Settings
-hostname=
-domain=
-dns1=
-dns2=
-
-# Private/Storage Network Settings (required)
-storage.ip=
-storage.netmask=
-storage.gateway=
-
-# Second Storage Network Settings (optional)
-storage.ip.2=
-storage.netmask.2=
-storage.gateway.2=
-
-# Datacenter Settings
-pod=
-zone=
-host=
-port=
-
-# Storage Appliance Settings (optional)
-# Specify if you would like to use this Storage Server with an external storage appliance)
-iscsi.iqn=
-iscsi.ip=
-iscsi.port=
-
-# VMOps IQN (optional)
-# Specify if you would like to manually change the IQN of the Storage Server's iSCSI target
-vmops.iqn=
-
-# MTU (optional)
-mtu=
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3a184a1b/build/deploy/production/agent/storagehdpatch/lib/svc/method/vmops
----------------------------------------------------------------------
diff --git a/build/deploy/production/agent/storagehdpatch/lib/svc/method/vmops b/build/deploy/production/agent/storagehdpatch/lib/svc/method/vmops
deleted file mode 100755
index 6ffde74..0000000
--- a/build/deploy/production/agent/storagehdpatch/lib/svc/method/vmops
+++ /dev/null
@@ -1,121 +0,0 @@
-#!/bin/bash
-#
-# vmops - Script to start and stop the VMOps 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.
-#
-# Author: Chiradeep Vittal <ch...@vmops.com>
-# chkconfig: 2345 99 01
-# description: Start up the VMOps agent
-
-# Source function library.
-if [ -f /etc/init.d/functions ]
-then
- . /etc/init.d/functions
-fi
-
-_success() {
- if [ -f /etc/init.d/functions ]
- then
- success
- else
- echo "Success"
- fi
-}
-
-_failure() {
- if [ -f /etc/init.d/functions ]
- then
- failure
- else
- echo "Failed"
- fi
-}
-RETVAL=$?
-VMOPS_HOME="/usr/local/vmops"
-
-mkdir -p /var/log/vmops
-
-get_pids() {
- local i
- for i in $(ps -ef | grep agent.sh | grep -v grep | awk '{print $2}');
- do
- echo $(pwdx $i) | grep "$VMOPS_HOME" | grep agent | awk -F: '{print $1}';
- done
-}
-
-start() {
- local pid=$(get_pids)
- echo -n "Starting VMOps agent: "
- if [ -f $VMOPS_HOME/agent/agent.sh ];
- then
- if [ "$pid" == "" ]
- then
- (cd $VMOPS_HOME/agent; nohup ./agent.sh > /var/log/vmops/vmops.out 2>&1 & )
- pid=$(get_pids)
- echo $pid > /var/run/vmops.pid
- fi
- _success
- else
- _failure
- fi
- echo
-}
-
-stop() {
- local pid
- echo -n "Stopping VMOps agent: "
- for pid in $(get_pids)
- do
- pgid=$(ps -o pgid -p $pid | tr '\n' ' ' | awk '{print $2}')
- pgid=${pgid## }
- pgid=${pgid%% }
- kill -- -$pgid
- done
- rm /var/run/vmops.pid
- _success
- echo
-}
-
-status() {
- local pids=$(get_pids)
- if [ "$pids" == "" ]
- then
- echo "VMOps agent is not running"
- return 1
- fi
- echo "VMOps agent (pid $pids) is running"
- return 0
-}
-
-
-case "$1" in
- start) start
- ;;
- stop) stop
- ;;
- status) status
- ;;
- restart) stop
- sleep 1.5
- start
- ;;
- *) echo $"Usage: $0 {start|stop|status|restart}"
- exit 1
- ;;
-esac
-
-exit $RETVAL
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3a184a1b/build/deploy/production/agent/storagehdpatch/usr/sbin/vsetup
----------------------------------------------------------------------
diff --git a/build/deploy/production/agent/storagehdpatch/usr/sbin/vsetup b/build/deploy/production/agent/storagehdpatch/usr/sbin/vsetup
deleted file mode 100755
index 44bacf8..0000000
--- a/build/deploy/production/agent/storagehdpatch/usr/sbin/vsetup
+++ /dev/null
@@ -1,59 +0,0 @@
-#! /bin/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.
-
-stage=$1
-option=$2
-
-export VMOPS_HOME=/usr/local/vmops
-
-usage() {
- echo "Usage: vsetup [networking|zpool]"
- echo " networking: probe NICs, configure networking, and detect disks"
- echo " zpool: create ZFS storage pool"
-}
-
-if [ "$stage" != "networking" ] && [ "$stage" != "zpool" ] && [ "$stage" != "detectdisks" ]
-then
- usage
- exit 1
-fi
-
-if [ "$option" != "" ] && [ "$option" != "-listonly" ]
-then
- usage
- exit 1
-fi
-
-$VMOPS_HOME/agent/scripts/installer/run_installer.sh storage $stage $option
-
-if [ $? -eq 0 ]
-then
- if [ "$stage" == "networking" ]
- then
- echo "Please edit /etc/vmops/disks.properties and then run \"vsetup zpool\"."
- else
- if [ "$stage" == "zpool" ]
- then
- echo "Press enter to reboot the computer..."
- read
- reboot
- fi
- fi
-fi
-
-
-
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3a184a1b/build/deploy/production/agent/storagehdpatch/var/svc/manifest/application/cloud.xml
----------------------------------------------------------------------
diff --git a/build/deploy/production/agent/storagehdpatch/var/svc/manifest/application/cloud.xml b/build/deploy/production/agent/storagehdpatch/var/svc/manifest/application/cloud.xml
deleted file mode 100644
index dc85bb2..0000000
--- a/build/deploy/production/agent/storagehdpatch/var/svc/manifest/application/cloud.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.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.
--->
-
-
-<service_bundle type='manifest' name='cloud'>
-
-<service
- name='application/cloud'
- type='service'
- version='0.1.0'>
-
- <!-- This is the cloud storage agent
- -->
-
- <create_default_instance enabled='false' />
-
- <single_instance />
-
- <dependency
- name='iscsi_target'
- grouping='require_all'
- restart_on='error'
- type='service'>
- <service_fmri value='svc:/network/iscsi/target:default' />
- </dependency>
-
- <exec_method
- type='method'
- name='start'
- exec='/lib/svc/method/cloud start'
- timeout_seconds='60'>
- </exec_method>
-
- <exec_method
- type='method'
- name='stop'
- exec='/lib/svc/method/cloud stop'
- timeout_seconds='60'>
- </exec_method>
-
-
-</service>
-
-</service_bundle>