From 6d22df9256e5c9de51c25c04008a463ba2356873 Mon Sep 17 00:00:00 2001 From: James Martin Date: Fri, 7 Dec 2012 14:18:42 -0500 Subject: [PATCH] Added script for starting cloudstack. Added python-mysql.connector package. renamed script to buildcloudstack. Signed-off-by: Rohit Yadav --- .../puppet/modules/devcloud/manifests/init.pp | 10 ++++++- ...devcloud.sh.erb => buildcloudstack.sh.erb} | 0 .../devcloud/templates/startcloudstack.sh.erb | 26 +++++++++++++++++++ 3 files changed, 35 insertions(+), 1 deletion(-) rename tools/devcloud/puppet/modules/devcloud/templates/{builddevcloud.sh.erb => buildcloudstack.sh.erb} (100%) create mode 100644 tools/devcloud/puppet/modules/devcloud/templates/startcloudstack.sh.erb diff --git a/tools/devcloud/puppet/modules/devcloud/manifests/init.pp b/tools/devcloud/puppet/modules/devcloud/manifests/init.pp index bbcd7b2b7d6..86ef72fd16b 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', diff --git a/tools/devcloud/puppet/modules/devcloud/templates/builddevcloud.sh.erb b/tools/devcloud/puppet/modules/devcloud/templates/buildcloudstack.sh.erb similarity index 100% rename from tools/devcloud/puppet/modules/devcloud/templates/builddevcloud.sh.erb rename to tools/devcloud/puppet/modules/devcloud/templates/buildcloudstack.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 00000000000..4a07711591b --- /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 &