Added script for starting cloudstack. Added python-mysql.connector package. renamed script to buildcloudstack.
Signed-off-by: Rohit Yadav <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/6d22df92 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/6d22df92 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/6d22df92 Branch: refs/heads/master Commit: 6d22df9256e5c9de51c25c04008a463ba2356873 Parents: 355df8a Author: James Martin <[email protected]> Authored: Fri Dec 7 14:18:42 2012 -0500 Committer: Rohit Yadav <[email protected]> Committed: Fri Dec 14 19:36:39 2012 -0800 ---------------------------------------------------------------------- .../puppet/modules/devcloud/manifests/init.pp | 10 +++++- .../devcloud/templates/buildcloudstack.sh.erb | 29 +++++++++++++++ .../devcloud/templates/builddevcloud.sh.erb | 29 --------------- .../devcloud/templates/startcloudstack.sh.erb | 26 +++++++++++++ 4 files changed, 64 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6d22df92/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 bbcd7b2..86ef72f 100644 --- a/tools/devcloud/puppet/modules/devcloud/manifests/init.pp +++ b/tools/devcloud/puppet/modules/devcloud/manifests/init.pp @@ -56,6 +56,7 @@ class devcloud ( package { [ 'ant', 'git', + 'python-mysql.connector', 'mkisofs', 'mysql-server', 'nfs-server', @@ -200,7 +201,14 @@ class devcloud ( mode => '0755', owner => '0', group => '0', - content => template('devcloud/builddevcloud.sh.erb'); + content => template('devcloud/buildcloudstack.sh.erb'); + + "${cs_dir}/startcloudstack.sh": + ensure => 'file', + mode => '0755', + owner => '0', + group => '0', + content => template('devcloud/startcloudstack.sh.erb'); '/root/.ssh' : ensure => 'directory', http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6d22df92/tools/devcloud/puppet/modules/devcloud/templates/buildcloudstack.sh.erb ---------------------------------------------------------------------- diff --git a/tools/devcloud/puppet/modules/devcloud/templates/buildcloudstack.sh.erb b/tools/devcloud/puppet/modules/devcloud/templates/buildcloudstack.sh.erb new file mode 100644 index 0000000..f42a101 --- /dev/null +++ b/tools/devcloud/puppet/modules/devcloud/templates/buildcloudstack.sh.erb @@ -0,0 +1,29 @@ +#!/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=<%= @tomcat_home %> +export M2_HOME=<%= @maven_home %> +export M2=$M2_HOME/bin +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 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 http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6d22df92/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 deleted file mode 100644 index f42a101..0000000 --- a/tools/devcloud/puppet/modules/devcloud/templates/builddevcloud.sh.erb +++ /dev/null @@ -1,29 +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=<%= @tomcat_home %> -export M2_HOME=<%= @maven_home %> -export M2=$M2_HOME/bin -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 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 http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6d22df92/tools/devcloud/puppet/modules/devcloud/templates/startcloudstack.sh.erb ---------------------------------------------------------------------- diff --git a/tools/devcloud/puppet/modules/devcloud/templates/startcloudstack.sh.erb b/tools/devcloud/puppet/modules/devcloud/templates/startcloudstack.sh.erb new file mode 100644 index 0000000..4a07711 --- /dev/null +++ b/tools/devcloud/puppet/modules/devcloud/templates/startcloudstack.sh.erb @@ -0,0 +1,26 @@ +#!/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=<%= @tomcat_home %> +export M2_HOME=<%= @maven_home %> +export M2=$M2_HOME/bin +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 -pl client jetty:run &
