You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2012/12/19 23:04:28 UTC
[34/50] [abbrv] git commit: Merge in of cleanup work.
Merge in of cleanup work.
Signed-off-by: Rohit Yadav <bh...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/b996aff4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/b996aff4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/b996aff4
Branch: refs/heads/ui-plugins
Commit: b996aff41866ea1455087cb5b24650ebd95f1f42
Parents: b7181bb
Author: James Martin <jm...@basho.com>
Authored: Thu Dec 6 16:26:20 2012 -0500
Committer: Rohit Yadav <bh...@apache.org>
Committed: Fri Dec 14 19:36:37 2012 -0800
----------------------------------------------------------------------
tools/devcloud/Gemfile | 2 +
tools/devcloud/Vagrantfile | 56 +++
tools/devcloud/basebuild/Vagrantfile | 51 ---
.../basebuild/puppet-devcloudinitial/Modulefile | 8 -
.../basebuild/puppet-devcloudinitial/files/grub | 52 ---
.../puppet-devcloudinitial/files/interfaces | 33 --
.../puppet-devcloudinitial/files/network.conf | 1 -
.../puppet-devcloudinitial/files/xen-defaults | 18 -
.../basebuild/puppet-devcloudinitial/files/xend | 188 --------
.../basebuild/puppet-devcloudinitial/init.pp | 18 -
.../puppet-devcloudinitial/manifests/init.pp | 106 -----
tools/devcloud/boxit.sh | 5 +
tools/devcloud/build_vagrant_basebox.sh | 99 ----
tools/devcloud/deps/boxer.sh | 176 ++++++++
tools/devcloud/deps/boxes/basebox-build/.rvmrc | 7 +
tools/devcloud/deps/boxes/basebox-build/Gemfile | 3 +
.../devcloud/deps/boxes/basebox-build/Gemfile.lock | 148 ++++++
.../deps/boxes/basebox-build/definition.rb | 60 +++
.../deps/boxes/basebox-build/postinstall.sh | 42 ++
.../devcloud/deps/boxes/basebox-build/preseed.cfg | 122 +++++
tools/devcloud/deps/boxes/xenbox-build/.rvmrc | 7 +
tools/devcloud/deps/boxes/xenbox-build/Gemfile | 2 +
.../devcloud/deps/boxes/xenbox-build/Gemfile.lock | 34 ++
tools/devcloud/deps/boxes/xenbox-build/Vagrantfile | 52 +++
.../puppet/manifests/vagrant-devcloudinitial.pp | 1 +
.../puppet/modules/devcloudinitial/Modulefile | 8 +
.../puppet/modules/devcloudinitial/files/grub | 52 +++
.../modules/devcloudinitial/files/interfaces | 32 ++
.../modules/devcloudinitial/files/network.conf | 1 +
.../modules/devcloudinitial/files/xen-defaults | 18 +
.../puppet/modules/devcloudinitial/files/xend | 188 ++++++++
.../modules/devcloudinitial/manifests/init.pp | 102 +++++
tools/devcloud/devcloudbox/Vagrantfile | 51 ---
.../devcloudbox/puppet-devcloud/Modulefile | 8 -
.../puppet-devcloud/files/builddevcloud.sh | 28 --
.../puppet-devcloud/files/configebtables.sh | 21 -
.../puppet-devcloud/files/configlocalstorage.sh | 25 -
.../devcloudbox/puppet-devcloud/files/configvnc.sh | 25 -
.../devcloudbox/puppet-devcloud/files/exports | 18 -
.../puppet-devcloud/files/installmaven.sh | 22 -
.../puppet-devcloud/files/iptables.save | 30 --
.../puppet-devcloud/files/startdevcloud.sh | 23 -
.../puppet-devcloud/files/updatecode.sh | 27 --
tools/devcloud/devcloudbox/puppet-devcloud/init.pp | 18 -
.../devcloudbox/puppet-devcloud/manifests/init.pp | 348 ---------------
tools/devcloud/devcloudsetup.sh | 151 -------
.../devcloud/puppet/manifests/vagrant-devcloud.pp | 18 +
tools/devcloud/puppet/modules/devcloud/Modulefile | 8 +
.../puppet/modules/devcloud/files/compare.sh | 6 +
.../modules/devcloud/files/configebtables.sh | 21 +
.../modules/devcloud/files/configlocalstorage.sh | 25 +
.../puppet/modules/devcloud/files/configvnc.sh | 25 +
.../devcloud/puppet/modules/devcloud/files/exports | 19 +
.../puppet/modules/devcloud/files/installmaven.sh | 22 +
.../puppet/modules/devcloud/files/iptables.save | 30 ++
.../puppet/modules/devcloud/files/startdevcloud.sh | 23 +
.../puppet/modules/devcloud/files/updatecode.sh | 27 ++
.../puppet/modules/devcloud/lib/facter/xeninfo.rb | 5 +
.../devcloud/manifests/functions/httpdownload.pp | 20 +
.../puppet/modules/devcloud/manifests/init.pp | 252 +++++++++++
.../puppet/modules/devcloud/manifests/params.pp | 64 +++
.../devcloud/templates/builddevcloud.sh.erb | 28 ++
tools/devcloud/veewee/definition.rb | 56 ---
tools/devcloud/veewee/postinstall.sh | 43 --
tools/devcloud/veewee/preseed.cfg | 122 -----
tools/devcloud/waitforxe.sh | 23 +
66 files changed, 1734 insertions(+), 1590 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b996aff4/tools/devcloud/Gemfile
----------------------------------------------------------------------
diff --git a/tools/devcloud/Gemfile b/tools/devcloud/Gemfile
new file mode 100644
index 0000000..bcc3310
--- /dev/null
+++ b/tools/devcloud/Gemfile
@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gem 'vagrant', :git => 'https://github.com/chipchilders/vagrant'
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b996aff4/tools/devcloud/Vagrantfile
----------------------------------------------------------------------
diff --git a/tools/devcloud/Vagrantfile b/tools/devcloud/Vagrantfile
new file mode 100644
index 0000000..11ee4bb
--- /dev/null
+++ b/tools/devcloud/Vagrantfile
@@ -0,0 +1,56 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# 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.
+
+Vagrant::Config.run do |config|
+ config.vm.box = "devcloud"
+ #config.vm.box = "devcloudbase-xen"
+ #config.vm.box_url = "http://basho-cloudstack.s3.amazonaws.com/devcloud.box"
+
+ config.vm.guest = :xen
+ config.ssh.username = "devcloud"
+ config.vm.host_name = "devcloud.local"
+ # Uncomment this line to enable the console for debugging the
+ # build process.
+ # config.vm.boot_mode = :gui
+
+ # Setup port forwarding
+ config.vm.forward_port 22, 7222
+ config.vm.forward_port 3306, 3306
+ config.vm.forward_port 8080, 8080
+ config.vm.forward_port 8443, 8443
+ config.vm.forward_port 5901, 5901
+ config.vm.forward_port 8787, 8787
+ config.vm.forward_port 8250, 8250
+ config.vm.forward_port 8096, 8096
+ config.vm.forward_port 7080, 7080
+ # Ensure the VM has the right virtual resources
+ #config.vm.
+ config.vm.customize ["modifyvm", :id, "--memory", 2048]
+ config.vm.provision :shell, :path => "waitforxe.sh"
+ config.vm.provision :puppet do |puppet|
+ puppet.with_ssh = true
+ puppet.manifests_path = File.join 'puppet', 'manifests'
+ puppet.module_path = File.join 'puppet', 'modules', 'devcloud'
+ puppet.manifest_file = 'vagrant-devcloud.pp'
+ puppet.options = ['--pluginsync', '--trace', '--debug', '--verbose']
+ end
+
+
+end
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b996aff4/tools/devcloud/basebuild/Vagrantfile
----------------------------------------------------------------------
diff --git a/tools/devcloud/basebuild/Vagrantfile b/tools/devcloud/basebuild/Vagrantfile
deleted file mode 100644
index a1f0740..0000000
--- a/tools/devcloud/basebuild/Vagrantfile
+++ /dev/null
@@ -1,51 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-# 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.
-
-Vagrant::Config.run do |config|
- config.vm.box = "devcloudbase"
- # TODO: Get a URL to host the base image
- # config.vm.box_url = "http://domain.com/path/to/above.box"
- config.vm.guest = :xen
- config.ssh.username = "devcloud"
-
- # Uncomment this line to enable the console for debugging the
- # build process.
- #config.vm.boot_mode = :gui
-
- # Setup port forwarding
- config.vm.forward_port 22, 2222
- config.vm.forward_port 8080, 8080
- config.vm.forward_port 8443, 8443
- config.vm.forward_port 5901, 5901
- config.vm.forward_port 8787, 8787
- config.vm.forward_port 8250, 8250
-
- # Ensure the VM has the right virtual resources
- #config.vm.
-
- config.vm.provision :puppet do |puppet|
- puppet.manifests_path = "puppet-devcloudinitial"
- puppet.manifest_file = "init.pp"
- puppet.with_ssh = true
- puppet.pp_path = "/etc/puppet"
- puppet.module_path = "puppet-devcloudinitial"
- end
-
-end
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b996aff4/tools/devcloud/basebuild/puppet-devcloudinitial/Modulefile
----------------------------------------------------------------------
diff --git a/tools/devcloud/basebuild/puppet-devcloudinitial/Modulefile b/tools/devcloud/basebuild/puppet-devcloudinitial/Modulefile
deleted file mode 100644
index b1ca9ad..0000000
--- a/tools/devcloud/basebuild/puppet-devcloudinitial/Modulefile
+++ /dev/null
@@ -1,8 +0,0 @@
-name 'puppet-devcloudinitial'
-version '0.0.1'
-source ''
-author 'Apache Software Foundation'
-license 'Licensed under the Apache License, Version 2.0. http://www.apache.org/licenses/LICENSE-2.0'
-summary 'CloudStack DevCloud initial configuration module'
-description 'Installation and configuration of all prequisites for building a DevCloud image.'
-project_page 'http://cloudstack.org'
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b996aff4/tools/devcloud/basebuild/puppet-devcloudinitial/files/grub
----------------------------------------------------------------------
diff --git a/tools/devcloud/basebuild/puppet-devcloudinitial/files/grub b/tools/devcloud/basebuild/puppet-devcloudinitial/files/grub
deleted file mode 100644
index be14e82..0000000
--- a/tools/devcloud/basebuild/puppet-devcloudinitial/files/grub
+++ /dev/null
@@ -1,52 +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.
-
-
-# If you change this file, run 'update-grub' afterwards to update
-# /boot/grub/grub.cfg.
-# For full documentation of the options in this file, see:
-# info -f grub -n 'Simple configuration'
-
-GRUB_DEFAULT=2
-#GRUB_HIDDEN_TIMEOUT=0
-GRUB_HIDDEN_TIMEOUT_QUIET=true
-GRUB_TIMEOUT=2
-GRUB_DISTRIBUTOR=`lsb_release -i -s 2> /dev/null || echo Debian`
-GRUB_CMDLINE_LINUX_DEFAULT=""
-GRUB_CMDLINE_LINUX=""
-
-# Uncomment to enable BadRAM filtering, modify to suit your needs
-# This works with Linux (no patch required) and with any kernel that obtains
-# the memory map information from GRUB (GNU Mach, kernel of FreeBSD ...)
-#GRUB_BADRAM="0x01234567,0xfefefefe,0x89abcdef,0xefefefef"
-
-# Uncomment to disable graphical terminal (grub-pc only)
-#GRUB_TERMINAL=console
-
-# The resolution used on graphical terminal
-# note that you can use only modes which your graphic card supports via VBE
-# you can see them in real GRUB with the command `vbeinfo'
-#GRUB_GFXMODE=640x480
-
-# Uncomment if you don't want GRUB to pass "root=UUID=xxx" parameter to Linux
-#GRUB_DISABLE_LINUX_UUID=true
-
-# Uncomment to disable generation of recovery mode menu entries
-#GRUB_DISABLE_RECOVERY="true"
-
-# Uncomment to get a beep at grub start
-#GRUB_INIT_TUNE="480 440 1"
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b996aff4/tools/devcloud/basebuild/puppet-devcloudinitial/files/interfaces
----------------------------------------------------------------------
diff --git a/tools/devcloud/basebuild/puppet-devcloudinitial/files/interfaces b/tools/devcloud/basebuild/puppet-devcloudinitial/files/interfaces
deleted file mode 100644
index f655079..0000000
--- a/tools/devcloud/basebuild/puppet-devcloudinitial/files/interfaces
+++ /dev/null
@@ -1,33 +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.
-
-# The loopback network interface
-auto lo
-iface lo inet loopback
-
-# The primary network interface
-auto xenbr0
-iface xenbr0 inet dhcp
- gateway 10.0.2.2
- bridge_ports eth0
-
-
-auto eth0
-iface eth0 inet dhcp
-pre-up iptables-save < /etc/iptables.save
-pre-up /etc/init.d/ebtables load
-
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b996aff4/tools/devcloud/basebuild/puppet-devcloudinitial/files/network.conf
----------------------------------------------------------------------
diff --git a/tools/devcloud/basebuild/puppet-devcloudinitial/files/network.conf b/tools/devcloud/basebuild/puppet-devcloudinitial/files/network.conf
deleted file mode 100644
index 7096907..0000000
--- a/tools/devcloud/basebuild/puppet-devcloudinitial/files/network.conf
+++ /dev/null
@@ -1 +0,0 @@
-bridge
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b996aff4/tools/devcloud/basebuild/puppet-devcloudinitial/files/xen-defaults
----------------------------------------------------------------------
diff --git a/tools/devcloud/basebuild/puppet-devcloudinitial/files/xen-defaults b/tools/devcloud/basebuild/puppet-devcloudinitial/files/xen-defaults
deleted file mode 100644
index bc3dc67..0000000
--- a/tools/devcloud/basebuild/puppet-devcloudinitial/files/xen-defaults
+++ /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.
-
-TOOLSTACK=xapi
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b996aff4/tools/devcloud/basebuild/puppet-devcloudinitial/files/xend
----------------------------------------------------------------------
diff --git a/tools/devcloud/basebuild/puppet-devcloudinitial/files/xend b/tools/devcloud/basebuild/puppet-devcloudinitial/files/xend
deleted file mode 100644
index 19ebd49..0000000
--- a/tools/devcloud/basebuild/puppet-devcloudinitial/files/xend
+++ /dev/null
@@ -1,188 +0,0 @@
-#!/bin/sh
-# 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.
-
-### BEGIN INIT INFO
-# Provides: xend
-# Required-Start: $remote_fs
-# Required-Stop: $remote_fs
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: XEN control daemon
-# Description: XEN control daemon
-### END INIT INFO
-
-PATH=/usr/lib/xen-common/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DESC="Xen daemons"
-
-VERSION=$(xen-version)
-ROOT=/usr/lib/xen-$VERSION
-
-XEND="$ROOT"/bin/xend
-XENCONSOLED="$ROOT"/bin/xenconsoled
-XENCONSOLED_PIDFILE="/var/run/xenconsoled.pid"
-XENSTORED="$ROOT"/bin/xenstored
-XENSTORED_DIR="/var/run/xenstored"
-XENSTORED_PIDFILE="/var/run/xenstore.pid"
-
-[ "$VERSION" ] || exit 0
-[ -x "$XEND" ] || exit 0
-
-[ -r /etc/default/xend ] && . /etc/default/xend
-
-. /lib/init/vars.sh
-. /lib/lsb/init-functions
-
-modules_setup()
-{
- modprobe xenfs 2>/dev/null
- modprobe xen-evtchn 2>/dev/null
- modprobe xen_blkback 2>/dev/null
- modprobe xen_netback 2>/dev/null
- modprobe xen_gntdev 2>/dev/null
-}
-
-xenfs_setup()
-{
- [ -e "/proc/xen/capabilities" ] && return 0
- log_progress_msg "xenfs"
- [ -d "/proc/xen" ] || return 1
- mount -t xenfs xenfs /proc/xen || return 1
- return 0
-}
-
-capability_check()
-{
- [ -e "/proc/xen/capabilities" ] || return 1
- grep -q "control_d" /proc/xen/capabilities || return 1
- return 0
-}
-
-xend_start()
-{
- log_progress_msg "xend"
- $XEND status && return 1
- $XEND start || return 2
-
- i=0
- while [ $i -lt 10 ]; do
- $XEND status && return 0 || true
- i=$(($i + 1))
- sleep 1
- done
- return 2
-}
-
-xend_stop()
-{
- log_progress_msg "xend"
- $XEND status || return 0
- $XEND stop || return 1
-}
-
-xenconsoled_start()
-{
- log_progress_msg "xenconsoled"
- start-stop-daemon --start --quiet --pidfile "$XENCONSOLED_PIDFILE" --exec "$XENCONSOLED" --test > /dev/null \
- || return 1
- start-stop-daemon --start --quiet --pidfile "$XENCONSOLED_PIDFILE" --exec "$XENCONSOLED" -- \
- $XENCONSOLED_ARGS --pid-file="$XENCONSOLED_PIDFILE" \
- || return 2
-}
-
-xenstored_start()
-{
- log_progress_msg "xenstored"
- start-stop-daemon --start --quiet --pidfile "$XENSTORED_PIDFILE" --exec "$XENSTORED" --test > /dev/null \
- || return 1
- [ -d "$XENSTORED_DIR" ] || mkdir -p "$XENSTORED_DIR"
- export XENSTORED_ROOTDIR="$XENSTORED_DIR"
- start-stop-daemon --start --quiet --pidfile "$XENSTORED_PIDFILE" --exec "$XENSTORED" -- \
- $XENSTORED_ARGS --pid-file="$XENSTORED_PIDFILE" \
- || return 2
-}
-
-case "$1" in
- start)
- log_daemon_msg "Starting $DESC"
- modules_setup
- xenfs_setup
- case "$?" in
- 0) ;;
- *) log_end_msg 1; exit ;;
- esac
- capability_check
- case "$?" in
- 0) ;;
- *) log_end_msg 255; exit ;;
- esac
- xenstored_start
- case "$?" in
- 0|1) ;;
- *) log_end_msg 1; exit ;;
- esac
- xenconsoled_start
- case "$?" in
- 0|1) ;;
- *) log_end_msg 1; exit ;;
- esac
- #xend_start
- case "$?" in
- 0|1) ;;
- *) log_end_msg 1; exit ;;
- esac
- log_end_msg 0
- ;;
- stop)
- capability_check
- case "$?" in
- 0) ;;
- *) exit ;;
- esac
- log_daemon_msg "Stopping $DESC"
- #xend_stop
- case "$?" in
- 0|1) log_end_msg 0 ;;
- *) log_end_msg 1 ;;
- esac
- ;;
- restart|force-reload)
- capability_check
- case "$?" in
- 0) ;;
- *) exit ;;
- esac
- log_daemon_msg "Restarting $DESC"
- #xend_stop
- case "$?" in
- 0|1)
- #xend_start
- case "$?" in
- 0) log_end_msg 0 ;;
- *) log_end_msg 1 ;;
- esac
- ;;
- *) log_end_msg 1 ;;
- esac
- ;;
- *)
- echo "Usage: $0 {start|stop|restart|force-reload}" >&2
- exit 3
- ;;
-esac
-
-exit 0
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b996aff4/tools/devcloud/basebuild/puppet-devcloudinitial/init.pp
----------------------------------------------------------------------
diff --git a/tools/devcloud/basebuild/puppet-devcloudinitial/init.pp b/tools/devcloud/basebuild/puppet-devcloudinitial/init.pp
deleted file mode 100644
index 213ef59..0000000
--- a/tools/devcloud/basebuild/puppet-devcloudinitial/init.pp
+++ /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.
-
-include puppet-devcloudinitial
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b996aff4/tools/devcloud/basebuild/puppet-devcloudinitial/manifests/init.pp
----------------------------------------------------------------------
diff --git a/tools/devcloud/basebuild/puppet-devcloudinitial/manifests/init.pp b/tools/devcloud/basebuild/puppet-devcloudinitial/manifests/init.pp
deleted file mode 100644
index ded2067..0000000
--- a/tools/devcloud/basebuild/puppet-devcloudinitial/manifests/init.pp
+++ /dev/null
@@ -1,106 +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.
-
-class puppet-devcloudinitial {
-
- package { 'linux-headers-3.2.0-23-generic':
- ensure => latest,
- }
-
- package { 'xen-hypervisor-4.1-i386':
- ensure => latest,
- }
-
- package { 'xcp-xapi':
- require => Package['xen-hypervisor-4.1-i386'],
- ensure => latest,
- }
-
- file { '/etc/xcp/network.conf':
- require => Package['xcp-xapi'],
- ensure => 'file',
- source => 'puppet:///modules/puppet-devcloudinitial/network.conf',
- group => '0',
- mode => '644',
- owner => '0',
- }
-
- file { '/etc/init.d/xend':
- require => Package['xcp-xapi'],
- ensure => 'file',
- source => 'puppet:///modules/puppet-devcloudinitial/xend',
- group => '0',
- owner => '0',
- mode => '755',
- }
-
- service { 'xendomains':
- require => Package['xcp-xapi'],
- ensure => 'stopped',
- enable => 'false',
- }
-
- file { '/etc/default/grub':
- require => Package['xen-hypervisor-4.1-i386'],
- ensure => 'file',
- source => 'puppet:///modules/puppet-devcloudinitial/grub',
- group => '0',
- mode => '644',
- owner => '0',
- }
-
- exec { "/usr/sbin/update-grub":
- subscribe => File['/etc/default/grub'],
- refreshonly => true,
- cwd => '/',
- }
-
- file { '/usr/share/qemu':
- require => Package['xen-hypervisor-4.1-i386'],
- ensure => 'directory',
- group => '0',
- mode => '755',
- owner => '0',
- }
-
- file { '/usr/share/qemu/keymaps':
- require => File['/usr/share/qemu'],
- ensure => 'link',
- group => '0',
- mode => '777',
- owner => '0',
- target => '/usr/share/qemu-linaro/keymaps',
- }
-
- file { '/etc/network/interfaces':
- ensure => 'file',
- source => 'puppet:///modules/puppet-devcloudinitial/interfaces',
- group => '0',
- mode => '644',
- owner => '0',
- }
-
- file { '/etc/default/xen':
- require => Package['xen-hypervisor-4.1-i386'],
- ensure => 'file',
- source => 'puppet:///modules/puppet-devcloudinitial/xen-defaults',
- group => '0',
- mode => '644',
- owner => '0',
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b996aff4/tools/devcloud/boxit.sh
----------------------------------------------------------------------
diff --git a/tools/devcloud/boxit.sh b/tools/devcloud/boxit.sh
new file mode 100644
index 0000000..ccf28c6
--- /dev/null
+++ b/tools/devcloud/boxit.sh
@@ -0,0 +1,5 @@
+#! /bin/bash -ex
+
+vagrant halt
+vagrant package default --output devcloud.box
+vagrant box add devcloud devcloud.box -f
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b996aff4/tools/devcloud/build_vagrant_basebox.sh
----------------------------------------------------------------------
diff --git a/tools/devcloud/build_vagrant_basebox.sh b/tools/devcloud/build_vagrant_basebox.sh
deleted file mode 100755
index c90a6c9..0000000
--- a/tools/devcloud/build_vagrant_basebox.sh
+++ /dev/null
@@ -1,99 +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.
-
-# Assumes that rvm is installed and you have ruby 1.9.2 installed
-# Assumes that you have virtual box installed
-# Assumes that you have wget installed
-set -x
-PROGNAME=$(basename $0)
-function error_exit {
-
- # Display error message and exit
- echo "${PROGNAME}: $*" 1>&2
- exit 1
-}
-
-
-# Load RVM into a shell session *as a function*
-if [[ -s "$HOME/.rvm/scripts/rvm" ]] ; then
-# First try to load from a user install
- source "$HOME/.rvm/scripts/rvm"
-
-elif [[ -s "/usr/local/rvm/scripts/rvm" ]] ; then
-
-# Then try to load from a root install
- source "/usr/local/rvm/scripts/rvm"
-
-else
-
- printf "ERROR: An RVM installation was not found.\n"
-
-fi
-
-mkdir ~/builddevcloud || error_exit
-cd ~/builddevcloud || error_exit
-git clone https://github.com/jedi4ever/veewee.git || error_exit
-#TODO: We need to get this patched version of Vagrant to the upstream project
-# or implement the desired changes to Vagrant as plugin modules and
-# host it within the ASF git repo
-git clone https://github.com/chipchilders/vagrant.git || error_exit
-export rvm_trust_rvmrcs_flag=1 || error_exit
-cd vagrant || error_exit
-bundle install || error_exit "could not bundle install vagrant"
-rake install || error_exit "could not rake vagrant"
-cd ~/builddevcloud/veewee || error_exit
-cp -R templates/ubuntu-12.04-server-i386 templates/ubuntu-12.04.1-server-i386
-cp -R templates/ubuntu-12.04-server-i386-packages templates/ubuntu-12.04.1-server-i386-packages
-bundle install || error_exit
-rake install || error_exit
-bundle exec vagrant basebox define 'devcloudbase' 'ubuntu-12.04.1-server-i386' || error_exit "couldn't basebox define"
-wget --no-check-certificate -O ./definitions/devcloudbase/definition.rb https://git-wip-us.apache.org/repos/asf\?p\=incubator-cloudstack.git\;a\=blob_plain\;f\=tools/devcloud/veewee/definition.rb\;hb\=HEAD || error_exit "couldn't get file"
-wget --no-check-certificate -O ./definitions/devcloudbase/postinstall.sh https://git-wip-us.apache.org/repos/asf\?p\=incubator-cloudstack.git\;a\=blob_plain\;f\=tools/devcloud/veewee/postinstall.sh\;hb\=HEAD || error_exit "couldn't get file"
-wget --no-check-certificate -O ./definitions/devcloudbase/preseed.cfg https://git-wip-us.apache.org/repos/asf\?p\=incubator-cloudstack.git\;a\=blob_plain\;f\=tools/devcloud/veewee/preseed.cfg\;hb\=HEAD || error_exit "couldn't get file"
-bundle exec vagrant basebox build 'devcloudbase' -f -a -n || error_exit "couldn't basebox build"
-# possibly use -r here too ^
-bundle exec vagrant basebox export 'devcloudbase' -f || error_exit "couldn't basebox export"
-bundle exec vagrant basebox destroy 'devcloudbase' -f || error_exit "couldn't basebox destroy"
-bundle exec vagrant box add 'devcloudbase' 'devcloudbase.box' -f || error_exit "couldn't basebox add"
-rm -f devcloudbase.box || error_exit
-cd ~/builddevcloud/vagrant || error_exit
-mkdir devcloudbase || error_exit
-cd devcloudbase || error_exit
-mkdir puppet-devcloudinitial || error_exit
-mkdir puppet-devcloudinitial/files || error_exit
-mkdir puppet-devcloudinitial/manifests || error_exit
-wget --no-check-certificate -O Vagrantfile "https://git-wip-us.apache.org/repos/asf?p=incubator-cloudstack.git;a=blob_plain;f=tools/devcloud/basebuild/Vagrantfile;hb=HEAD" || error_exit
-wget --no-check-certificate -O puppet-devcloudinitial/init.pp "https://git-wip-us.apache.org/repos/asf?p=incubator-cloudstack.git;a=blob_plain;f=tools/devcloud/basebuild/puppet-devcloudinitial/init.pp;hb=HEAD" || error_exit
-wget --no-check-certificate -O puppet-devcloudinitial/Modulefile "https://git-wip-us.apache.org/repos/asf?p=incubator-cloudstack.git;a=blob_plain;f=tools/devcloud/basebuild/puppet-devcloudinitial/Modulefile;hb=HEAD" || error_exit
-wget --no-check-certificate -O puppet-devcloudinitial/files/grub "https://git-wip-us.apache.org/repos/asf?p=incubator-cloudstack.git;a=blob_plain;f=tools/devcloud/basebuild/puppet-devcloudinitial/files/grub;hb=HEAD" || error_exit
-wget --no-check-certificate -O puppet-devcloudinitial/files/interfaces "https://git-wip-us.apache.org/repos/asf?p=incubator-cloudstack.git;a=blob_plain;f=tools/devcloud/basebuild/puppet-devcloudinitial/files/interfaces;hb=HEAD" || error_exit
-wget --no-check-certificate -O puppet-devcloudinitial/files/network.conf "https://git-wip-us.apache.org/repos/asf?p=incubator-cloudstack.git;a=blob_plain;f=tools/devcloud/basebuild/puppet-devcloudinitial/files/network.conf;hb=HEAD" || error_exit
-wget --no-check-certificate -O puppet-devcloudinitial/files/xen-defaults "https://git-wip-us.apache.org/repos/asf?p=incubator-cloudstack.git;a=blob_plain;f=tools/devcloud/basebuild/puppet-devcloudinitial/files/xen-defaults;hb=HEAD" || error_exit
-wget --no-check-certificate -O puppet-devcloudinitial/files/xend "https://git-wip-us.apache.org/repos/asf?p=incubator-cloudstack.git;a=blob_plain;f=tools/devcloud/basebuild/puppet-devcloudinitial/files/xend;hb=HEAD" || error_exit
-wget --no-check-certificate -O puppet-devcloudinitial/manifests/init.pp "https://git-wip-us.apache.org/repos/asf?p=incubator-cloudstack.git;a=blob_plain;f=tools/devcloud/basebuild/puppet-devcloudinitial/manifests/init.pp;hb=HEAD" || error_exit
-cd ~/builddevcloud/vagrant/
-bundle install || error_exit
-rake install || error_exit
-cd ~/builddevcloud/vagrant/devcloudbase/
-bundle exec vagrant up || error_exit "vagrant up failed"
-bundle exec vagrant halt || error_exit "vagrant halt failed"
-bundle exec vagrant package default --output ~/devcloud.box || error_exit "vagrant package failed"
-bundle exec vagrant destroy -f || error_exit "vagrant destroy failed"
-bundle exec vagrant box remove devcloudbase virtualbox || error_exit "vagrant box remove failed"
-
-echo "Your new devcloud base box is stored in ~/devcloud.box"
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b996aff4/tools/devcloud/deps/boxer.sh
----------------------------------------------------------------------
diff --git a/tools/devcloud/deps/boxer.sh b/tools/devcloud/deps/boxer.sh
new file mode 100755
index 0000000..1b7bd10
--- /dev/null
+++ b/tools/devcloud/deps/boxer.sh
@@ -0,0 +1,176 @@
+#! /bin/bash
+
+
+# Load RVM into a shell session *as a function*
+if [[ -s "$HOME/.rvm/scripts/rvm" ]] ; then
+# First try to load from a user install
+ source "$HOME/.rvm/scripts/rvm"
+
+elif [[ -s "/usr/local/rvm/scripts/rvm" ]] ; then
+
+# Then try to load from a root install
+ source "/usr/local/rvm/scripts/rvm"
+
+else
+
+ printf "ERROR: An RVM installation was not found.\n"
+
+fi
+
+BASEDIR=$PWD/boxes
+DEVCLOUD_BASEBUILD_DIR=$BASEDIR/basebox-build
+echo $DEVCLOUD_BASEBUILD_DIR
+DEVCLOUD_XEN_BASEBUILD_DIR=$BASEDIR/xenbox-build
+DEVCLOUD_BASE_NAME='devcloudbase'
+DEVCLOUD_XEN_BASE_NAME='devcloudbase-xen'
+OS='ubuntu-12.04.1-server-i386'
+
+
+basebox() {
+ set +x
+ rvm rvmrc trust $DEVCLOUD_BASEBUILD_DIR/
+ case "$1" in
+ build)
+ cd $DEVCLOUD_BASEBUILD_DIR/
+ set -ex
+ vagrant basebox define $DEVCLOUD_BASE_NAME $OS
+ cp definition.rb postinstall.sh preseed.cfg definitions/$DEVCLOUD_BASE_NAME/
+ vagrant basebox build $DEVCLOUD_BASE_NAME -f -a -n -r
+ vagrant basebox export $DEVCLOUD_BASE_NAME -f
+ set +ex
+ cd $DEVCLOUD_XEN_BASEBUILD_DIR
+ set -ex
+ vagrant box add $DEVCLOUD_BASE_NAME $DEVCLOUD_BASEBUILD_DIR/${DEVCLOUD_BASE_NAME}.box -f
+ ;;
+ clean)
+ cd $DEVCLOUD_BASEBUILD_DIR/
+ set -x
+ rm -f iso/*.iso
+ vagrant -f basebox destroy $DEVCLOUD_BASE_NAME #-f
+ vagrant basebox undefine $DEVCLOUD_BASE_NAME
+ #hackery to inherit the proper rvmrc for the hacked vagrant
+ set +x
+ cd $BAS$DEVCLOUD_XEN_BASEBUILD_DIR
+ set -x
+ vagrant -f box remove $DEVCLOUD_BASE_NAME virtualbox
+ set +x
+ cd $DEVCLOUD_BASEBUILD_DIR
+ set -x
+ rm -f ${DEVCLOUD_BASE_NAME}.box
+ set +x
+ cd $BASEDIR
+ #rvm --force gemset delete vagrant-release-cloudstack
+ ;;
+ esac
+}
+
+xenbox() {
+
+ set +x
+ rvm rvmrc trust $DEVCLOUD_XEN_BASEBUILD_DIR/
+ case "$1" in
+ build)
+ cd $DEVCLOUD_XEN_BASEBUILD_DIR
+
+ #adding it here because it needs to be added into the $VAGRANT_HOME of
+ #the hacked vagrant
+ set -ex
+ vagrant up
+ vagrant halt
+ vagrant package default --output ${DEVCLOUD_XEN_BASE_NAME}.box
+ vagrant box add $DEVCLOUD_XEN_BASE_NAME ${DEVCLOUD_XEN_BASE_NAME}.box -f
+ ;;
+ clean)
+ cd $DEVCLOUD_XEN_BASEBUILD_DIR
+ set -x
+ vagrant -f box remove $DEVCLOUD_XEN_BASE_NAME virtualbox
+ vagrant destroy -f
+ rm -f ${DEVCLOUD_XEN_BASE_NAME}.box
+ set +x
+ #rvm --force gemset delete vagrant-xen-cloudstack
+ set -x
+ ;;
+ esac
+}
+usage() {
+
+cat <<EOF
+$(basename $0) [-h] [-b] [c] (basebox|xenbox) | all
+Builds / cleans boxes used to build the devcloud box
+
+where:
+ -h show this help text
+ -b builds the box(es)
+ -c cleans the box(es)
+
+EOF
+}
+
+while getopts 'hbc' option; do
+ case "$option" in
+ h) usage
+ exit
+ ;;
+ b) action="build"
+ ;;
+ c) action="clean"
+ ;;
+ ?) printf "illegal option: '%s'\n" "$OPTARG" >&2
+ echo "$usage" >&2
+ exit 1
+ ;;
+ esac
+done
+shift $((OPTIND - 1))
+
+posargs=$@
+
+#removes duplicate positionals
+
+posargs=$(echo "$posargs" | tr ' ' '\n' | nl | sort -u -k2 | sort -n | cut -f2-)
+
+
+
+for arg in $posargs; do
+
+ case "$arg" in
+ basebox)
+ true
+ ;;
+ xenbox)
+ true
+ ;;
+ all)
+ true
+ ;;
+ *)
+ usage
+ exit 1
+ ;;
+ esac
+
+done
+
+
+cd $BASEDIR
+
+
+for arg in $posargs; do
+ case "$1" in
+ "all")
+ case "$action" in
+ clean)
+ xenbox $action
+ basebox $action
+ ;;
+ build)
+ basebox $action
+ xenbox $action
+ ;;
+ esac
+ ;;
+ $arg)
+ $arg $action
+ ;;
+ esac
+done
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b996aff4/tools/devcloud/deps/boxes/basebox-build/.rvmrc
----------------------------------------------------------------------
diff --git a/tools/devcloud/deps/boxes/basebox-build/.rvmrc b/tools/devcloud/deps/boxes/basebox-build/.rvmrc
new file mode 100644
index 0000000..cbeb628
--- /dev/null
+++ b/tools/devcloud/deps/boxes/basebox-build/.rvmrc
@@ -0,0 +1,7 @@
+rvm use ruby-1.9.3@vagrant-release-cloudstack --create
+export VAGRANT_HOME=$HOME/.vagrant.d-release-cloudstack
+bundle check > /dev/null 2>&1
+RETVAL=$?
+if [ $RETVAL -ne 0 ]; then
+ bundle install
+fi
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b996aff4/tools/devcloud/deps/boxes/basebox-build/Gemfile
----------------------------------------------------------------------
diff --git a/tools/devcloud/deps/boxes/basebox-build/Gemfile b/tools/devcloud/deps/boxes/basebox-build/Gemfile
new file mode 100644
index 0000000..1649e85
--- /dev/null
+++ b/tools/devcloud/deps/boxes/basebox-build/Gemfile
@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+gem 'veewee', :git => 'https://github.com/jedi4ever/veewee.git'
+gem 'em-winrm'
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b996aff4/tools/devcloud/deps/boxes/basebox-build/Gemfile.lock
----------------------------------------------------------------------
diff --git a/tools/devcloud/deps/boxes/basebox-build/Gemfile.lock b/tools/devcloud/deps/boxes/basebox-build/Gemfile.lock
new file mode 100644
index 0000000..4550837
--- /dev/null
+++ b/tools/devcloud/deps/boxes/basebox-build/Gemfile.lock
@@ -0,0 +1,148 @@
+GIT
+ remote: https://github.com/jedi4ever/veewee.git
+ revision: b766b90aa1903b4bf7f28f0ea4922dce4471cd03
+ specs:
+ veewee (0.3.1)
+ ansi (~> 1.3.0)
+ childprocess
+ cucumber (>= 1.0.0)
+ fission (= 0.4.0)
+ fog (~> 1.4)
+ grit
+ highline
+ i18n
+ net-ssh (~> 2.2.0)
+ popen4 (~> 0.1.2)
+ progressbar
+ rspec (~> 2.5)
+ ruby-vnc (~> 1.0.0)
+ thor (~> 0.15)
+ vagrant (>= 0.9)
+
+GEM
+ remote: https://rubygems.org/
+ specs:
+ CFPropertyList (2.0.17)
+ libxml-ruby (>= 1.1.0)
+ rake (>= 0.7.0)
+ Platform (0.4.0)
+ akami (1.2.0)
+ gyoku (>= 0.4.0)
+ nokogiri (>= 1.4.0)
+ ansi (1.3.0)
+ archive-tar-minitar (0.5.2)
+ builder (3.1.4)
+ childprocess (0.3.6)
+ ffi (~> 1.0, >= 1.0.6)
+ cucumber (1.2.1)
+ builder (>= 2.1.2)
+ diff-lcs (>= 1.1.3)
+ gherkin (~> 2.11.0)
+ json (>= 1.4.6)
+ diff-lcs (1.1.3)
+ em-winrm (0.5.4)
+ eventmachine (= 1.0.0.beta.3)
+ mixlib-log (>= 1.3.0)
+ uuidtools (~> 2.1.1)
+ winrm (~> 1.1.0)
+ erubis (2.7.0)
+ eventmachine (1.0.0.beta.3)
+ excon (0.16.10)
+ ffi (1.2.0)
+ fission (0.4.0)
+ CFPropertyList (~> 2.0.17)
+ fog (1.7.0)
+ builder
+ excon (~> 0.14)
+ formatador (~> 0.2.0)
+ mime-types
+ multi_json (~> 1.0)
+ net-scp (~> 1.0.4)
+ net-ssh (>= 2.1.3)
+ nokogiri (~> 1.5.0)
+ ruby-hmac
+ formatador (0.2.4)
+ gherkin (2.11.5)
+ json (>= 1.4.6)
+ grit (2.5.0)
+ diff-lcs (~> 1.1)
+ mime-types (~> 1.15)
+ posix-spawn (~> 0.3.6)
+ gssapi (1.0.3)
+ ffi (>= 1.0.1)
+ gyoku (0.4.6)
+ builder (>= 2.1.2)
+ highline (1.6.15)
+ httpclient (2.2.0.2)
+ httpi (0.9.7)
+ rack
+ i18n (0.6.1)
+ json (1.5.4)
+ libxml-ruby (2.3.3)
+ little-plugger (1.1.3)
+ log4r (1.1.10)
+ logging (1.6.2)
+ little-plugger (>= 1.1.3)
+ mime-types (1.19)
+ mixlib-log (1.4.1)
+ multi_json (1.3.7)
+ net-scp (1.0.4)
+ net-ssh (>= 1.99.1)
+ net-ssh (2.2.2)
+ nokogiri (1.5.5)
+ nori (1.1.3)
+ open4 (1.3.0)
+ popen4 (0.1.2)
+ Platform (>= 0.4.0)
+ open4 (>= 0.4.0)
+ posix-spawn (0.3.6)
+ progressbar (0.11.0)
+ rack (1.4.1)
+ rake (10.0.2)
+ rspec (2.12.0)
+ rspec-core (~> 2.12.0)
+ rspec-expectations (~> 2.12.0)
+ rspec-mocks (~> 2.12.0)
+ rspec-core (2.12.0)
+ rspec-expectations (2.12.0)
+ diff-lcs (~> 1.1.3)
+ rspec-mocks (2.12.0)
+ ruby-hmac (0.4.0)
+ ruby-vnc (1.0.1)
+ rubyntlm (0.1.1)
+ savon (0.9.5)
+ akami (~> 1.0)
+ builder (>= 2.1.2)
+ gyoku (>= 0.4.0)
+ httpi (~> 0.9)
+ nokogiri (>= 1.4.0)
+ nori (~> 1.0)
+ wasabi (~> 1.0)
+ thor (0.16.0)
+ uuidtools (2.1.3)
+ vagrant (1.0.5)
+ archive-tar-minitar (= 0.5.2)
+ childprocess (~> 0.3.1)
+ erubis (~> 2.7.0)
+ i18n (~> 0.6.0)
+ json (~> 1.5.1)
+ log4r (~> 1.1.9)
+ net-scp (~> 1.0.4)
+ net-ssh (~> 2.2.2)
+ wasabi (1.0.0)
+ nokogiri (>= 1.4.0)
+ winrm (1.1.2)
+ gssapi (~> 1.0.0)
+ httpclient (~> 2.2.0.2)
+ logging (~> 1.6.1)
+ nokogiri (~> 1.5.0)
+ rubyntlm (~> 0.1.1)
+ savon (= 0.9.5)
+ uuidtools (~> 2.1.2)
+
+PLATFORMS
+ ruby
+
+DEPENDENCIES
+ em-winrm
+ veewee!
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b996aff4/tools/devcloud/deps/boxes/basebox-build/Vagrantfile
----------------------------------------------------------------------
diff --git a/tools/devcloud/deps/boxes/basebox-build/Vagrantfile b/tools/devcloud/deps/boxes/basebox-build/Vagrantfile
new file mode 100644
index 0000000..e69de29
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b996aff4/tools/devcloud/deps/boxes/basebox-build/definition.rb
----------------------------------------------------------------------
diff --git a/tools/devcloud/deps/boxes/basebox-build/definition.rb b/tools/devcloud/deps/boxes/basebox-build/definition.rb
new file mode 100644
index 0000000..a7f9071
--- /dev/null
+++ b/tools/devcloud/deps/boxes/basebox-build/definition.rb
@@ -0,0 +1,60 @@
+# 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.
+
+
+Veewee::Session.declare({
+ :cpu_count => '1',
+ :memory_size=> '2048',
+ :disk_size => '20000',
+ :disk_format => 'VMDK',
+ :hostiocache => 'off',
+ :os_type_id => 'Ubuntu',
+ :iso_file => "ubuntu-12.04.1-server-i386.iso",
+ :iso_src => "http://releases.ubuntu.com/12.04/ubuntu-12.04.1-server-i386.iso",
+ :iso_md5 => '32184a83c8b5e6031e1264e5c499bc03',
+ :iso_download_timeout => "1000",
+ :boot_wait => "4",
+ :virtualbox => {
+ :vm_options => [
+ "ioapic" => "on",
+ "hwvirtex" => "on",
+ "nestedpaging" => "on"
+ ]
+ },
+ :boot_cmd_sequence => [
+ '<Esc><Esc><Enter>',
+ '/install/vmlinuz noapic preseed/url=http://%IP%:%PORT%/preseed.cfg ',
+ 'debian-installer=en_US auto locale=en_US kbd-chooser/method=us ',
+ 'hostname=%NAME% ',
+ 'fb=false debconf/frontend=noninteractive ',
+ 'keyboard-configuration/layout=USA keyboard-configuration/variant=USA console-setup/ask_detect=false ',
+ 'initrd=/install/initrd.gz -- <Enter>'
+],
+ :kickstart_port => "7122",
+ :kickstart_timeout => "10000",
+ :kickstart_file => "preseed.cfg",
+ :ssh_login_timeout => "10000",
+ :ssh_user => "devcloud",
+ :ssh_password => "devcloud",
+ :ssh_key => "",
+ :ssh_host_port => "2222",
+ :ssh_guest_port => "22",
+ :sudo_cmd => "echo '%p'|sudo -S sh '%f'",
+ :shutdown_cmd => "shutdown -P now",
+ :postinstall_files => [ "postinstall.sh"],
+ :postinstall_timeout => "10000"
+})
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b996aff4/tools/devcloud/deps/boxes/basebox-build/postinstall.sh
----------------------------------------------------------------------
diff --git a/tools/devcloud/deps/boxes/basebox-build/postinstall.sh b/tools/devcloud/deps/boxes/basebox-build/postinstall.sh
new file mode 100644
index 0000000..217d230
--- /dev/null
+++ b/tools/devcloud/deps/boxes/basebox-build/postinstall.sh
@@ -0,0 +1,42 @@
+# 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.
+
+apt-get -y update
+apt-get -y upgrade
+apt-get -y install vim
+apt-get -y install ruby
+apt-get -y install rubygems
+apt-get -y install puppet
+apt-get clean
+
+# Setup sudo to allow no-password sudo for "admin"
+groupadd -r admin
+usermod -a -G admin devcloud
+echo "root:password" | chpasswd
+sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=admin' /etc/sudoers
+sed -i -e 's/%admin ALL=(ALL) ALL/%admin ALL=NOPASSWD:ALL/g' /etc/sudoers
+
+mkdir /home/devcloud/.ssh
+chmod 700 /home/devcloud/.ssh
+cd /home/devcloud/.ssh
+wget --no-check-certificate 'https://raw.github.com/mitchellh/vagrant/master/keys/vagrant.pub' -O authorized_keys
+chmod 600 /home/devcloud/.ssh/authorized_keys
+chown -R devcloud /home/devcloud/.ssh
+
+# Zero out the free space to save space in the final image:
+dd if=/dev/zero of=/EMPTY bs=1M
+rm -f /EMPTY
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b996aff4/tools/devcloud/deps/boxes/basebox-build/preseed.cfg
----------------------------------------------------------------------
diff --git a/tools/devcloud/deps/boxes/basebox-build/preseed.cfg b/tools/devcloud/deps/boxes/basebox-build/preseed.cfg
new file mode 100644
index 0000000..00bae61
--- /dev/null
+++ b/tools/devcloud/deps/boxes/basebox-build/preseed.cfg
@@ -0,0 +1,122 @@
+# 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.
+
+## Options to set on the command line
+d-i debian-installer/locale string en_US.utf8
+d-i console-setup/ask_detect boolean false
+d-i console-setup/layout string USA
+
+#d-i netcfg/get_hostname string dummy
+d-i netcfg/get_hostname string devcloud
+d-i netcfg/get_domain string cloudstack.org
+
+# Continue without a default route
+# Not working , specify a dummy in the DHCP
+#d-i netcfg/no_default_route boolean
+
+d-i time/zone string UTC
+d-i clock-setup/utc-auto boolean true
+d-i clock-setup/utc boolean true
+
+d-i kbd-chooser/method select American English
+
+d-i netcfg/wireless_wep string
+
+d-i base-installer/kernel/override-image string linux-server
+#d-i base-installer/kernel/override-image string linux-image-2.6.32-21-generic
+
+# Choices: Dialog, Readline, Gnome, Kde, Editor, Noninteractive
+d-i debconf debconf/frontend select Noninteractive
+
+d-i pkgsel/install-language-support boolean false
+tasksel tasksel/first multiselect standard, ubuntu-server
+
+#d-i partman-auto/method string regular
+d-i partman-auto/method string lvm
+d-i partman-auto-lvm/no_boot boolean true
+d-i partman-auto/disk string /dev/sda
+d-i partman-auto-lvm/new_vg_name string devcloud
+d-i partman-auto/purge_lvm_from_device boolean true
+d-i partman-basicfilesystems/no_swap boolean false
+
+d-i partman-lvm/confirm boolean true
+d-i partman-lvm/device_remove_lvm boolean true
+d-i partman-auto/choose_recipe select devcloud
+
+d-i partman/confirm_write_new_label boolean true
+d-i partman/confirm_nooverwrite boolean true
+d-i partman/choose_partition select finish
+d-i partman/confirm boolean true
+d-i partman-auto/expert_recipe string \
+devcloud :: \
+4000 4500 4500 ext4 method{ lvm } \
+$lvmok{ } mountpoint{ / } lv_name{ root } \
+format{ } use_filesystem{ } filesystem{ ext4 } \
+.\
+15000 15000 15000 ext4 method{ lvm } \
+$lvmok{ } mountpoint{ /opt } lv_name{ data } \
+format{ } use_filesystem{ } filesystem{ ext4 } \
+.
+
+#http://ubuntu-virginia.ubuntuforums.org/showthread.php?p=9626883
+#Message: "write the changes to disk and configure lvm preseed"
+#http://serverfault.com/questions/189328/ubuntu-kickstart-installation-using-lvm-waits-for-input
+#preseed partman-lvm/confirm_nooverwrite boolean true
+
+# Write the changes to disks and configure LVM?
+d-i partman-lvm/confirm boolean true
+d-i partman-lvm/confirm_nooverwrite boolean true
+d-i partman-partitioning/confirm_write_new_label boolean true
+d-i partman/choose_partition select Finish
+d-i partman/confirm_nooverwrite boolean true
+d-i partman/confirm boolean true
+d-i partman-auto-lvm/guided_size string max
+
+## Default user, we can get away with a recipe to change this
+d-i passwd/user-fullname string devcloud
+d-i passwd/username string devcloud
+d-i passwd/user-password password devcloud
+d-i passwd/user-password-again password devcloud
+d-i user-setup/encrypt-home boolean false
+d-i user-setup/allow-password-weak boolean true
+
+## minimum is puppet and ssh and ntp
+# Individual additional packages to install
+d-i pkgsel/include string openssh-server ntp
+
+# Whether to upgrade packages after debootstrap.
+# Allowed values: none, safe-upgrade, full-upgrade
+d-i pkgsel/upgrade select full-upgrade
+
+d-i grub-installer/only_debian boolean true
+d-i grub-installer/with_other_os boolean true
+d-i finish-install/reboot_in_progress note
+
+#For the update
+d-i pkgsel/update-policy select none
+
+# debconf-get-selections --install
+#Use mirror
+#d-i apt-setup/use_mirror boolean true
+#d-i mirror/country string manual
+#choose-mirror-bin mirror/protocol string http
+#choose-mirror-bin mirror/http/hostname string 192.168.4.150
+#choose-mirror-bin mirror/http/directory string /ubuntu
+#choose-mirror-bin mirror/suite select maverick
+#d-i debian-installer/allow_unauthenticated string true
+
+choose-mirror-bin mirror/http/proxy string
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b996aff4/tools/devcloud/deps/boxes/xenbox-build/.rvmrc
----------------------------------------------------------------------
diff --git a/tools/devcloud/deps/boxes/xenbox-build/.rvmrc b/tools/devcloud/deps/boxes/xenbox-build/.rvmrc
new file mode 100644
index 0000000..fa4f7ad
--- /dev/null
+++ b/tools/devcloud/deps/boxes/xenbox-build/.rvmrc
@@ -0,0 +1,7 @@
+rvm use ruby-1.9.3@vagrant-xen-cloudstack --create
+export VAGRANT_HOME=$HOME/.vagrant.d-xen-cloudstack
+bundle check > /dev/null 2>&1
+RETVAL=$?
+if [ $RETVAL -ne 0 ]; then
+ bundle install
+fi
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b996aff4/tools/devcloud/deps/boxes/xenbox-build/Gemfile
----------------------------------------------------------------------
diff --git a/tools/devcloud/deps/boxes/xenbox-build/Gemfile b/tools/devcloud/deps/boxes/xenbox-build/Gemfile
new file mode 100644
index 0000000..8eab1c7
--- /dev/null
+++ b/tools/devcloud/deps/boxes/xenbox-build/Gemfile
@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gem 'vagrant', :git => 'https://github.com/chipchilders/vagrant'
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b996aff4/tools/devcloud/deps/boxes/xenbox-build/Gemfile.lock
----------------------------------------------------------------------
diff --git a/tools/devcloud/deps/boxes/xenbox-build/Gemfile.lock b/tools/devcloud/deps/boxes/xenbox-build/Gemfile.lock
new file mode 100644
index 0000000..e63bbc6
--- /dev/null
+++ b/tools/devcloud/deps/boxes/xenbox-build/Gemfile.lock
@@ -0,0 +1,34 @@
+GIT
+ remote: https://github.com/chipchilders/vagrant
+ revision: 781b2d974108a5421765883034fc27dd9857e9c0
+ specs:
+ vagrant (1.1.0.dev)
+ archive-tar-minitar (= 0.5.2)
+ childprocess (~> 0.3.1)
+ erubis (~> 2.7.0)
+ i18n (~> 0.6.0)
+ json (~> 1.6.6)
+ log4r (~> 1.1.9)
+ net-scp (~> 1.0.4)
+ net-ssh (~> 2.2.2)
+
+GEM
+ remote: https://rubygems.org/
+ specs:
+ archive-tar-minitar (0.5.2)
+ childprocess (0.3.6)
+ ffi (~> 1.0, >= 1.0.6)
+ erubis (2.7.0)
+ ffi (1.2.0)
+ i18n (0.6.1)
+ json (1.6.7)
+ log4r (1.1.10)
+ net-scp (1.0.4)
+ net-ssh (>= 1.99.1)
+ net-ssh (2.2.2)
+
+PLATFORMS
+ ruby
+
+DEPENDENCIES
+ vagrant!
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b996aff4/tools/devcloud/deps/boxes/xenbox-build/Vagrantfile
----------------------------------------------------------------------
diff --git a/tools/devcloud/deps/boxes/xenbox-build/Vagrantfile b/tools/devcloud/deps/boxes/xenbox-build/Vagrantfile
new file mode 100644
index 0000000..58e9e64
--- /dev/null
+++ b/tools/devcloud/deps/boxes/xenbox-build/Vagrantfile
@@ -0,0 +1,52 @@
+ # -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# 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.
+
+Vagrant::Config.run do |config|
+ config.vm.box = "devcloudbase"
+ # TODO: Get a URL to host the base image
+ # config.vm.box_url = "http://domain.com/path/to/above.box"
+ config.vm.guest = :xen
+ config.ssh.username = "devcloud"
+ config.vm.host_name = "devcloud.local"
+
+ # Uncomment this line to enable the console for debugging the
+ # build process.
+ #config.vm.boot_mode = :gui
+
+ # Setup port forwarding
+ # config.vm.forward_port 22, 2222
+ # config.vm.forward_port 8080, 8080
+ # config.vm.forward_port 8443, 8443
+ # config.vm.forward_port 5901, 5901
+ # config.vm.forward_port 8787, 8787
+ # config.vm.forward_port 8250, 8250
+
+ # Ensure the VM has the right virtual resources
+ #config.vm.
+
+ config.vm.provision :puppet do |puppet|
+ puppet.with_ssh = true
+ puppet.manifests_path = File.join 'puppet', 'manifests'
+ puppet.module_path = File.join 'puppet', 'modules', 'devcloudinitial'
+ puppet.manifest_file = 'vagrant-devcloudinitial.pp'
+ puppet.options = ['--trace', '--debug', '--verbose']
+ end
+
+end
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b996aff4/tools/devcloud/deps/boxes/xenbox-build/puppet/manifests/site.pp
----------------------------------------------------------------------
diff --git a/tools/devcloud/deps/boxes/xenbox-build/puppet/manifests/site.pp b/tools/devcloud/deps/boxes/xenbox-build/puppet/manifests/site.pp
new file mode 100644
index 0000000..e69de29
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b996aff4/tools/devcloud/deps/boxes/xenbox-build/puppet/manifests/vagrant-devcloudinitial.pp
----------------------------------------------------------------------
diff --git a/tools/devcloud/deps/boxes/xenbox-build/puppet/manifests/vagrant-devcloudinitial.pp b/tools/devcloud/deps/boxes/xenbox-build/puppet/manifests/vagrant-devcloudinitial.pp
new file mode 100644
index 0000000..4f7cfb5
--- /dev/null
+++ b/tools/devcloud/deps/boxes/xenbox-build/puppet/manifests/vagrant-devcloudinitial.pp
@@ -0,0 +1 @@
+node default { include devcloudinitial }
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b996aff4/tools/devcloud/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/Modulefile
----------------------------------------------------------------------
diff --git a/tools/devcloud/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/Modulefile b/tools/devcloud/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/Modulefile
new file mode 100644
index 0000000..b1ca9ad
--- /dev/null
+++ b/tools/devcloud/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/Modulefile
@@ -0,0 +1,8 @@
+name 'puppet-devcloudinitial'
+version '0.0.1'
+source ''
+author 'Apache Software Foundation'
+license 'Licensed under the Apache License, Version 2.0. http://www.apache.org/licenses/LICENSE-2.0'
+summary 'CloudStack DevCloud initial configuration module'
+description 'Installation and configuration of all prequisites for building a DevCloud image.'
+project_page 'http://cloudstack.org'
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b996aff4/tools/devcloud/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/files/grub
----------------------------------------------------------------------
diff --git a/tools/devcloud/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/files/grub b/tools/devcloud/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/files/grub
new file mode 100644
index 0000000..d5de16c
--- /dev/null
+++ b/tools/devcloud/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/files/grub
@@ -0,0 +1,52 @@
+# 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.
+
+
+# If you change this file, run 'update-grub' afterwards to update
+# /boot/grub/grub.cfg.
+# For full documentation of the options in this file, see:
+# info -f grub -n 'Simple configuration'
+
+GRUB_DEFAULT=2
+#GRUB_HIDDEN_TIMEOUT=0
+GRUB_HIDDEN_TIMEOUT_QUIET=true
+GRUB_TIMEOUT=2
+GRUB_DISTRIBUTOR=`lsb_release -i -s 2> /dev/null || echo Debian`
+GRUB_CMDLINE_LINUX_DEFAULT=""
+GRUB_CMDLINE_LINUX=""
+
+# Uncomment to enable BadRAM filtering, modify to suit your needs
+# This works with Linux (no patch required) and with any kernel that obtains
+# the memory map information from GRUB (GNU Mach, kernel of FreeBSD ...)
+#GRUB_BADRAM="0x01234567,0xfefefefe,0x89abcdef,0xefefefef"
+
+# Uncomment to disable graphical terminal (grub-pc only)
+#GRUB_TERMINAL=console
+
+# The resolution used on graphical terminal
+# note that you can use only modes which your graphic card supports via VBE
+# you can see them in real GRUB with the command `vbeinfo'
+#GRUB_GFXMODE=640x480
+
+# Uncomment if you don't want GRUB to pass "root=UUID=xxx" parameter to Linux
+#GRUB_DISABLE_LINUX_UUID=true
+
+# Uncomment to disable generation of recovery mode menu entries
+#GRUB_DISABLE_RECOVERY="true"
+
+# Uncomment to get a beep at grub start
+#GRUB_INIT_TUNE="480 440 1"
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b996aff4/tools/devcloud/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/files/interfaces
----------------------------------------------------------------------
diff --git a/tools/devcloud/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/files/interfaces b/tools/devcloud/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/files/interfaces
new file mode 100644
index 0000000..20eaa3b
--- /dev/null
+++ b/tools/devcloud/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/files/interfaces
@@ -0,0 +1,32 @@
+# 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.
+
+# The loopback network interface
+auto lo
+iface lo inet loopback
+
+# The primary network interface
+auto xenbr0
+iface xenbr0 inet dhcp
+ gateway 10.0.2.2
+ bridge_ports eth0
+
+
+auto eth0
+iface eth0 inet dhcp
+pre-up iptables-save < /etc/iptables.save
+pre-up /etc/init.d/ebtables load
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b996aff4/tools/devcloud/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/files/network.conf
----------------------------------------------------------------------
diff --git a/tools/devcloud/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/files/network.conf b/tools/devcloud/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/files/network.conf
new file mode 100644
index 0000000..7096907
--- /dev/null
+++ b/tools/devcloud/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/files/network.conf
@@ -0,0 +1 @@
+bridge
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b996aff4/tools/devcloud/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/files/xen-defaults
----------------------------------------------------------------------
diff --git a/tools/devcloud/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/files/xen-defaults b/tools/devcloud/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/files/xen-defaults
new file mode 100644
index 0000000..9083968
--- /dev/null
+++ b/tools/devcloud/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/files/xen-defaults
@@ -0,0 +1,18 @@
+# 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.
+
+TOOLSTACK=xapi
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b996aff4/tools/devcloud/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/files/xend
----------------------------------------------------------------------
diff --git a/tools/devcloud/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/files/xend b/tools/devcloud/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/files/xend
new file mode 100644
index 0000000..4a53299
--- /dev/null
+++ b/tools/devcloud/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/files/xend
@@ -0,0 +1,188 @@
+#!/bin/sh
+# 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.
+
+### BEGIN INIT INFO
+# Provides: xend
+# Required-Start: $remote_fs
+# Required-Stop: $remote_fs
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: XEN control daemon
+# Description: XEN control daemon
+### END INIT INFO
+
+PATH=/usr/lib/xen-common/bin:/sbin:/bin:/usr/sbin:/usr/bin
+DESC="Xen daemons"
+
+VERSION=$(xen-version)
+ROOT=/usr/lib/xen-$VERSION
+
+XEND="$ROOT"/bin/xend
+XENCONSOLED="$ROOT"/bin/xenconsoled
+XENCONSOLED_PIDFILE="/var/run/xenconsoled.pid"
+XENSTORED="$ROOT"/bin/xenstored
+XENSTORED_DIR="/var/run/xenstored"
+XENSTORED_PIDFILE="/var/run/xenstore.pid"
+
+[ "$VERSION" ] || exit 0
+[ -x "$XEND" ] || exit 0
+
+[ -r /etc/default/xend ] && . /etc/default/xend
+
+. /lib/init/vars.sh
+. /lib/lsb/init-functions
+
+modules_setup()
+{
+ modprobe xenfs 2>/dev/null
+ modprobe xen-evtchn 2>/dev/null
+ modprobe xen_blkback 2>/dev/null
+ modprobe xen_netback 2>/dev/null
+ modprobe xen_gntdev 2>/dev/null
+}
+
+xenfs_setup()
+{
+ [ -e "/proc/xen/capabilities" ] && return 0
+ log_progress_msg "xenfs"
+ [ -d "/proc/xen" ] || return 1
+ mount -t xenfs xenfs /proc/xen || return 1
+ return 0
+}
+
+capability_check()
+{
+ [ -e "/proc/xen/capabilities" ] || return 1
+ grep -q "control_d" /proc/xen/capabilities || return 1
+ return 0
+}
+
+xend_start()
+{
+ log_progress_msg "xend"
+ $XEND status && return 1
+ $XEND start || return 2
+
+ i=0
+ while [ $i -lt 10 ]; do
+ $XEND status && return 0 || true
+ i=$(($i + 1))
+ sleep 1
+ done
+ return 2
+}
+
+xend_stop()
+{
+ log_progress_msg "xend"
+ $XEND status || return 0
+ $XEND stop || return 1
+}
+
+xenconsoled_start()
+{
+ log_progress_msg "xenconsoled"
+ start-stop-daemon --start --quiet --pidfile "$XENCONSOLED_PIDFILE" --exec "$XENCONSOLED" --test > /dev/null \
+ || return 1
+ start-stop-daemon --start --quiet --pidfile "$XENCONSOLED_PIDFILE" --exec "$XENCONSOLED" -- \
+ $XENCONSOLED_ARGS --pid-file="$XENCONSOLED_PIDFILE" \
+ || return 2
+}
+
+xenstored_start()
+{
+ log_progress_msg "xenstored"
+ start-stop-daemon --start --quiet --pidfile "$XENSTORED_PIDFILE" --exec "$XENSTORED" --test > /dev/null \
+ || return 1
+ [ -d "$XENSTORED_DIR" ] || mkdir -p "$XENSTORED_DIR"
+ export XENSTORED_ROOTDIR="$XENSTORED_DIR"
+ start-stop-daemon --start --quiet --pidfile "$XENSTORED_PIDFILE" --exec "$XENSTORED" -- \
+ $XENSTORED_ARGS --pid-file="$XENSTORED_PIDFILE" \
+ || return 2
+}
+
+case "$1" in
+ start)
+ log_daemon_msg "Starting $DESC"
+ modules_setup
+ xenfs_setup
+ case "$?" in
+ 0) ;;
+ *) log_end_msg 1; exit ;;
+ esac
+ capability_check
+ case "$?" in
+ 0) ;;
+ *) log_end_msg 255; exit ;;
+ esac
+ xenstored_start
+ case "$?" in
+ 0|1) ;;
+ *) log_end_msg 1; exit ;;
+ esac
+ xenconsoled_start
+ case "$?" in
+ 0|1) ;;
+ *) log_end_msg 1; exit ;;
+ esac
+ #xend_start
+ case "$?" in
+ 0|1) ;;
+ *) log_end_msg 1; exit ;;
+ esac
+ log_end_msg 0
+ ;;
+ stop)
+ capability_check
+ case "$?" in
+ 0) ;;
+ *) exit ;;
+ esac
+ log_daemon_msg "Stopping $DESC"
+ #xend_stop
+ case "$?" in
+ 0|1) log_end_msg 0 ;;
+ *) log_end_msg 1 ;;
+ esac
+ ;;
+ restart|force-reload)
+ capability_check
+ case "$?" in
+ 0) ;;
+ *) exit ;;
+ esac
+ log_daemon_msg "Restarting $DESC"
+ #xend_stop
+ case "$?" in
+ 0|1)
+ #xend_start
+ case "$?" in
+ 0) log_end_msg 0 ;;
+ *) log_end_msg 1 ;;
+ esac
+ ;;
+ *) log_end_msg 1 ;;
+ esac
+ ;;
+ *)
+ echo "Usage: $0 {start|stop|restart|force-reload}" >&2
+ exit 3
+ ;;
+esac
+
+exit 0
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b996aff4/tools/devcloud/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/manifests/init.pp
----------------------------------------------------------------------
diff --git a/tools/devcloud/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/manifests/init.pp b/tools/devcloud/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/manifests/init.pp
new file mode 100644
index 0000000..c076a71
--- /dev/null
+++ b/tools/devcloud/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/manifests/init.pp
@@ -0,0 +1,102 @@
+# 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.
+
+class devcloudinitial {
+
+if $::architecture == 'x86_64'{
+ $debarch='amd64'
+}
+else {
+ $debarch='i386'
+}
+ package {
+ "linux-headers-${::kernelrelease}":
+ ensure => latest;
+ "xen-hypervisor-4.1-${debarch}":
+ ensure => latest,
+ require => Package["linux-headers-${::kernelrelease}"];
+ "xcp-xapi":
+ require => Package["xen-hypervisor-4.1-${debarch}"],
+ ensure => latest;
+ }
+
+ file {
+ '/etc/xcp/network.conf':
+ require => Package['xcp-xapi'],
+ ensure => 'file',
+ source => 'puppet:///modules/devcloudinitial/network.conf',
+ group => '0',
+ mode => '644',
+ owner => '0';
+ '/etc/init.d/xend':
+ require => Package['xcp-xapi'],
+ ensure => 'file',
+ source => 'puppet:///modules/devcloudinitial/xend',
+ group => '0',
+ owner => '0',
+ mode => '755';
+ '/etc/default/grub':
+ require => Package["xen-hypervisor-4.1-${debarch}"],
+ ensure => 'file',
+ source => 'puppet:///modules/devcloudinitial/grub',
+ group => '0',
+ mode => '644',
+ owner => '0';
+ '/usr/share/qemu':
+ require => Package["xen-hypervisor-4.1-${debarch}"],
+ ensure => 'directory',
+ group => '0',
+ mode => '755',
+ owner => '0';
+ '/usr/share/qemu/keymaps':
+ require => File['/usr/share/qemu'],
+ ensure => 'link',
+ group => '0',
+ mode => '777',
+ owner => '0',
+ target => '/usr/share/qemu-linaro/keymaps';
+ '/etc/network/interfaces':
+ ensure => 'file',
+ source => 'puppet:///modules/devcloudinitial/interfaces',
+ group => '0',
+ mode => '644',
+ owner => '0';
+ '/etc/default/xen':
+ require => Package["xen-hypervisor-4.1-${debarch}"],
+ ensure => 'file',
+ source => 'puppet:///modules/devcloudinitial/xen-defaults',
+ group => '0',
+ mode => '644',
+ owner => '0';
+
+ }
+
+ service {
+ 'xendomains':
+ require => Package['xcp-xapi'],
+ ensure => 'stopped',
+ enable => false;
+ }
+
+
+ exec { "/usr/sbin/update-grub":
+ subscribe => File['/etc/default/grub'],
+ refreshonly => true,
+ cwd => '/',
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b996aff4/tools/devcloud/devcloudbox/Vagrantfile
----------------------------------------------------------------------
diff --git a/tools/devcloud/devcloudbox/Vagrantfile b/tools/devcloud/devcloudbox/Vagrantfile
deleted file mode 100644
index 121a9f5..0000000
--- a/tools/devcloud/devcloudbox/Vagrantfile
+++ /dev/null
@@ -1,51 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-# 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.
-
-Vagrant::Config.run do |config|
- config.vm.box = "devcloud"
- # TODO: Get a URL to host the base image
- # config.vm.box_url = "http://domain.com/path/to/above.box"
- config.vm.guest = :xen
- config.ssh.username = "devcloud"
-
- # Uncomment this line to enable the console for debugging the
- # build process.
- # config.vm.boot_mode = :gui
-
- # Setup port forwarding
- config.vm.forward_port 22, 2222
- config.vm.forward_port 8080, 8080
- config.vm.forward_port 8443, 8443
- config.vm.forward_port 5901, 5901
- config.vm.forward_port 8787, 8787
- config.vm.forward_port 8250, 8250
-
- # Ensure the VM has the right virtual resources
- #config.vm.
-
- config.vm.provision :puppet do |puppet|
- puppet.manifests_path = "puppet-devcloud"
- puppet.manifest_file = "init.pp"
- puppet.with_ssh = true
- puppet.pp_path = "/etc/puppet"
- puppet.module_path = "puppet-devcloud"
- end
-
-end
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b996aff4/tools/devcloud/devcloudbox/puppet-devcloud/Modulefile
----------------------------------------------------------------------
diff --git a/tools/devcloud/devcloudbox/puppet-devcloud/Modulefile b/tools/devcloud/devcloudbox/puppet-devcloud/Modulefile
deleted file mode 100644
index ace7d48..0000000
--- a/tools/devcloud/devcloudbox/puppet-devcloud/Modulefile
+++ /dev/null
@@ -1,8 +0,0 @@
-name 'puppet-devcloud'
-version '0.0.1'
-source ''
-author 'Apache Software Foundation'
-license 'Licensed under the Apache License, Version 2.0. http://www.apache.org/licenses/LICENSE-2.0'
-summary 'CloudStack DevCloud configuration module'
-description 'Devcloud setup module.'
-project_page 'http://cloudstack.org'
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b996aff4/tools/devcloud/devcloudbox/puppet-devcloud/files/builddevcloud.sh
----------------------------------------------------------------------
diff --git a/tools/devcloud/devcloudbox/puppet-devcloud/files/builddevcloud.sh b/tools/devcloud/devcloudbox/puppet-devcloud/files/builddevcloud.sh
deleted file mode 100644
index 03bd854..0000000
--- a/tools/devcloud/devcloudbox/puppet-devcloud/files/builddevcloud.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-# 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.
-
-export CATALINA_HOME=/opt/cloudstack/apache-tomcat-6.0.32
-export M2_HOME=/opt/cloudstack/apache-maven-3.0.4
-export M2=$M2_HOME/bin
-MAVEN_OPTS="-Xms256m -Xmx512m"
-PATH=$M2:$PATH
-cd /opt/cloudstack/incubator-cloudstack/
-/usr/bin/mvn -P deps
-/usr/bin/mvn clean
-/usr/bin/ant clean-all build-all deploy-server deploydb
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b996aff4/tools/devcloud/devcloudbox/puppet-devcloud/files/configebtables.sh
----------------------------------------------------------------------
diff --git a/tools/devcloud/devcloudbox/puppet-devcloud/files/configebtables.sh b/tools/devcloud/devcloudbox/puppet-devcloud/files/configebtables.sh
deleted file mode 100644
index 741884e..0000000
--- a/tools/devcloud/devcloudbox/puppet-devcloud/files/configebtables.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-# 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.
-mac=`/sbin/ifconfig xenbr0 |/bin/grep HWaddr |/usr/bin/awk '{print $5}'`
-/sbin/ebtables -I FORWARD -d ! $mac -i eth0 -p IPV4 --ip-prot udp --ip-dport 67:68 -j DROP
-exit 0
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b996aff4/tools/devcloud/devcloudbox/puppet-devcloud/files/configlocalstorage.sh
----------------------------------------------------------------------
diff --git a/tools/devcloud/devcloudbox/puppet-devcloud/files/configlocalstorage.sh b/tools/devcloud/devcloudbox/puppet-devcloud/files/configlocalstorage.sh
deleted file mode 100644
index ab47d2d..0000000
--- a/tools/devcloud/devcloudbox/puppet-devcloud/files/configlocalstorage.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-# 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.
-/usr/bin/xe sr-list | /bin/grep local-storage
-rc=$?
-if [[ $rc != 0 ]] ; then
- hostuuid=`xe host-list |grep uuid|awk '{print $5}'`;
- xe sr-create host-uuid=$hostuuid name-label=local-storage shared=false type=file device-config:location=/opt/storage/primary
-fi
-exit 0
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b996aff4/tools/devcloud/devcloudbox/puppet-devcloud/files/configvnc.sh
----------------------------------------------------------------------
diff --git a/tools/devcloud/devcloudbox/puppet-devcloud/files/configvnc.sh b/tools/devcloud/devcloudbox/puppet-devcloud/files/configvnc.sh
deleted file mode 100644
index b13a7a3..0000000
--- a/tools/devcloud/devcloudbox/puppet-devcloud/files/configvnc.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-# 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.
-
-grep 0.0.0.0 /usr/lib/xcp/lib/vncterm-wrapper
-rc=$?
-if [[ $rc != 0 ]] ; then
- sed -i 's/VNCTERM_LISTEN=.\+/VNCTERM_LISTEN="-v 0.0.0.0:1"/' /usr/lib/xcp/lib/vncterm-wrapper
-fi
-exit 0
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b996aff4/tools/devcloud/devcloudbox/puppet-devcloud/files/exports
----------------------------------------------------------------------
diff --git a/tools/devcloud/devcloudbox/puppet-devcloud/files/exports b/tools/devcloud/devcloudbox/puppet-devcloud/files/exports
deleted file mode 100644
index c270c63..0000000
--- a/tools/devcloud/devcloudbox/puppet-devcloud/files/exports
+++ /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.
-
-/opt/storage/secondary *(rw,no_subtree_check,no_root_squash,fsid=0)
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b996aff4/tools/devcloud/devcloudbox/puppet-devcloud/files/installmaven.sh
----------------------------------------------------------------------
diff --git a/tools/devcloud/devcloudbox/puppet-devcloud/files/installmaven.sh b/tools/devcloud/devcloudbox/puppet-devcloud/files/installmaven.sh
deleted file mode 100644
index 48ffdfe..0000000
--- a/tools/devcloud/devcloudbox/puppet-devcloud/files/installmaven.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-# 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.
-
-cd /opt/cloudstack
-/usr/bin/wget http://apache.mirrors.pair.com/maven/maven-3/3.0.4/binaries/apache-maven-3.0.4-bin.tar.gz
-/bin/tar xvfz apache-maven-3.0.4-bin.tar.gz