You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2012/12/15 04:37:13 UTC
[12/15] git commit: Successfully building devcloud now. Added option
in params.pp for compiling cloudstack or not. moved ebtables stuff to
devcloudinitial update build scripts in builddevcloud.sh.erb
Successfully building devcloud now. Added option in params.pp for compiling cloudstack or not. moved ebtables stuff to devcloudinitial update build scripts in builddevcloud.sh.erb
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/a990f7ab
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/a990f7ab
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/a990f7ab
Branch: refs/heads/master
Commit: a990f7abe474da3e8a9d21c20f5bc3da0436b3bd
Parents: 7340433
Author: James Martin <jm...@basho.com>
Authored: Fri Dec 7 01:26:14 2012 -0500
Committer: Rohit Yadav <bh...@apache.org>
Committed: Fri Dec 14 19:36:38 2012 -0800
----------------------------------------------------------------------
tools/devcloud/Vagrantfile | 2 +-
.../modules/devcloudinitial/manifests/init.pp | 2 +
.../puppet/modules/devcloud/manifests/init.pp | 43 +++++++--------
.../puppet/modules/devcloud/manifests/params.pp | 2 +-
.../devcloud/templates/builddevcloud.sh.erb | 9 ++--
5 files changed, 30 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a990f7ab/tools/devcloud/Vagrantfile
----------------------------------------------------------------------
diff --git a/tools/devcloud/Vagrantfile b/tools/devcloud/Vagrantfile
index 9e6bfae..7820d81 100644
--- a/tools/devcloud/Vagrantfile
+++ b/tools/devcloud/Vagrantfile
@@ -19,7 +19,7 @@
# under the License.
Vagrant::Config.run do |config|
- config.vm.network :hostonly, "192.168.56.10"
+ config.vm.network :hostonly, "192.168.56.10", :auto_config => false
#config.vm.box = "devcloud"
config.vm.box = "devcloudbase-xen"
#config.vm.box_url = "http://basho-cloudstack.s3.amazonaws.com/devcloud.box"
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a990f7ab/tools/devcloud/boxit.sh
----------------------------------------------------------------------
diff --git a/tools/devcloud/boxit.sh b/tools/devcloud/boxit.sh
old mode 100644
new mode 100755
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a990f7ab/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
index a3e3a5a..6e5924a 100644
--- 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
@@ -34,6 +34,8 @@ else {
ensure => latest;
"iptables":
ensure => latest;
+ "ebtables":
+ ensure => latest;
}
file {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a990f7ab/tools/devcloud/puppet/modules/devcloud/manifests/init.pp
----------------------------------------------------------------------
diff --git a/tools/devcloud/puppet/modules/devcloud/manifests/init.pp b/tools/devcloud/puppet/modules/devcloud/manifests/init.pp
index 12e68f4..0f146c5 100644
--- a/tools/devcloud/puppet/modules/devcloud/manifests/init.pp
+++ b/tools/devcloud/puppet/modules/devcloud/manifests/init.pp
@@ -33,8 +33,8 @@ class devcloud (
$md5sum_local = $devcloud::params::md5sum_local,
$md5sum_remote = $devcloud::params::md5sum_remote,
$hostuuid = $::xen_hostuuid,
- $bridge_device_mac = $::macaddress_xenbr0
-
+ $bridge_device_mac = $::macaddress_xenbr0,
+ $build_cloudstack = $devcloud::params::build_cloudstack
) inherits devcloud::params {
@@ -43,7 +43,6 @@ class devcloud (
service {
'ebtables':
- require => Package['ebtables'],
ensure => 'running',
enable => true;
'nfs-kernel-server':
@@ -55,8 +54,6 @@ class devcloud (
package { [
"ant",
- "ebtables",
- "iptables",
"git",
"mkisofs",
"mysql-server",
@@ -102,7 +99,6 @@ class devcloud (
unless => '/usr/bin/xe sr-list | /bin/egrep \'local-storage|Cloud Stack Local EXT Storage Pool\'',
require => [
File["${storage_dir}/primary"],
- File["/etc/iptables.save"]
];
"configvnc":
@@ -131,19 +127,6 @@ class devcloud (
require => Exec['unziptomcat'],
timeout => '0';
- "build_cloudstack":
- require => [
- Package["ant"],
- Exec["install_maven"],
- File["${cs_dir}/incubator-cloudstack/dist"],
- File["${cs_dir}/incubator-cloudstack/target"],
- Package['mkisofs'],
- File["${cs_dir}/buildcloudstack.sh"]
- ],
- command => "/opt/cloudstack/buildcloudstack.sh",
- cwd => "/opt/cloudstack/",
- timeout => '0';
-
"install_maven":
require => Exec["downloadmaven"],
@@ -165,14 +148,30 @@ class devcloud (
require => [
Service['ebtables']
],
- command => "/sbin/ebtables -I FORWARD -d ! $bridge_device_mac -i eth0 -p IPV4 --ip-prot udp --ip-dport 67:68 -j DROP",
- subscribe => Package["ebtables"],
- unless => "/sbin/ebtables -L | grep \"-I FORWARD -d ! $bridge_device_mac -i eth0 -p IPV4 --ip-prot udp --ip-dport 67:68 -j DROP\"",
+ command => "/sbin/ebtables -I FORWARD -d ! $bridge_device_mac -i eth1 -p IPV4 --ip-prot udp --ip-dport 67:68 -j DROP",
+ unless => "/sbin/ebtables -L | grep \"-I FORWARD -d ! $bridge_device_mac -i eth1 -p IPV4 --ip-prot udp --ip-dport 67:68 -j DROP\"",
refreshonly => true,
cwd => "/",
path => "/sbin/:/usr/bin/:/bin"
}
+ if $build_cloudstack {
+
+ exec {
+ "build_cloudstack":
+ require => [
+ Package["ant"],
+ Exec["install_maven"],
+ File["${cs_dir}/incubator-cloudstack/dist"],
+ File["${cs_dir}/incubator-cloudstack/target"],
+ Package['mkisofs'],
+ File["${cs_dir}/buildcloudstack.sh"]],
+ command => "${cs_dir}/buildcloudstack.sh",
+ cwd => "${cs_dir}",
+ timeout => '0';
+ }
+ }
+
file {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a990f7ab/tools/devcloud/puppet/modules/devcloud/manifests/params.pp
----------------------------------------------------------------------
diff --git a/tools/devcloud/puppet/modules/devcloud/manifests/params.pp b/tools/devcloud/puppet/modules/devcloud/manifests/params.pp
index 51f0706..f267a93 100644
--- a/tools/devcloud/puppet/modules/devcloud/manifests/params.pp
+++ b/tools/devcloud/puppet/modules/devcloud/manifests/params.pp
@@ -27,7 +27,7 @@ class devcloud::params {
$md5sum_local = "${storage_dir}/secondary/template/tmpl/1/md5sum.txt"
$template_dir = "${storage_dir}/secondary/template/tmpl/1"
$gitrepo = "https://github.com/apache/incubator-cloudstack.git"
-
+ $build_cloudstack = true
$downloads = [
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a990f7ab/tools/devcloud/puppet/modules/devcloud/templates/builddevcloud.sh.erb
----------------------------------------------------------------------
diff --git a/tools/devcloud/puppet/modules/devcloud/templates/builddevcloud.sh.erb b/tools/devcloud/puppet/modules/devcloud/templates/builddevcloud.sh.erb
index e42eedf..f42a101 100644
--- a/tools/devcloud/puppet/modules/devcloud/templates/builddevcloud.sh.erb
+++ b/tools/devcloud/puppet/modules/devcloud/templates/builddevcloud.sh.erb
@@ -20,9 +20,10 @@
export CATALINA_HOME=<%= @tomcat_home %>
export M2_HOME=<%= @maven_home %>
export M2=$M2_HOME/bin
-MAVEN_OPTS="-Xms256m -Xmx512m"
+MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=800m -Xdebug -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n"
PATH=$M2:$PATH
cd <%= @cs_dir %>/incubator-cloudstack/
-<%= @maven_home %>/bin/mvn -P developer clean install
-<%= @maven_home %>/bin/mvn -P developer -pl developer,tools/devcloud -Ddeploydb
-<%= @maven_home %>/bin/mvn -P developer -pl tools/devcloud -Ddeploysvr
\ No newline at end of file
+<%= @maven_home %>/bin/mvn clean install -P developer,systemvm
+<%= @maven_home %>/bin/mvn -pl developer,tools/devcloud -Ddeploydb -P developer
+<%= @maven_home %>/bin/mvn -P developer -pl tools/devcloud -Ddeploysvr
+<%= @maven_home %>/bin/mvn -pl client jetty:run