Repository: incubator-stratos Updated Branches: refs/heads/master cf15bd6c5 -> 348fc626f
config.sh use for creating a generic cartridge Signed-off-by: Manula Thantriwatte <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/348fc626 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/348fc626 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/348fc626 Branch: refs/heads/master Commit: 348fc626fe0361bbcc30d16f556cfce6f12ce4f7 Parents: cf15bd6 Author: Dinesh Bandara <[email protected]> Authored: Mon Mar 31 16:44:16 2014 +0530 Committer: Manula Thantriwatte <[email protected]> Committed: Mon Mar 31 16:54:05 2014 +0530 ---------------------------------------------------------------------- tools/puppet3-agent/config.sh | 6 +++--- tools/puppet3/manifests/nodes.pp | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/348fc626/tools/puppet3-agent/config.sh ---------------------------------------------------------------------- diff --git a/tools/puppet3-agent/config.sh b/tools/puppet3-agent/config.sh index a9b77e9..3347b80 100755 --- a/tools/puppet3-agent/config.sh +++ b/tools/puppet3-agent/config.sh @@ -53,7 +53,7 @@ function valid_ip() return $stat } -read -p "This script will install and configure puppet agent, do you want to continue [y/N]" answer +read -p "This script will install and configure puppet agent, do you want to continue [y/n]" answer if [[ $answer = y ]] ; then ${CP} -f ${HOSTSFILE} /etc/hosts.tmp @@ -62,8 +62,8 @@ if [[ $answer = y ]] ; then read -p "Please provide stratos service-name:" SERVICE_NAME if [[ -z $SERVICE_NAME ]]; then - echo "service name cannot be empty!" - exit -1 + echo "service is empty!. Base image will be created." + SERVICE_NAME=default fi read -p "Please provide puppet master IP:" PUPPET_IP http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/348fc626/tools/puppet3/manifests/nodes.pp ---------------------------------------------------------------------- diff --git a/tools/puppet3/manifests/nodes.pp b/tools/puppet3/manifests/nodes.pp index dbfd27f..36e6d2b 100644 --- a/tools/puppet3/manifests/nodes.pp +++ b/tools/puppet3/manifests/nodes.pp @@ -118,6 +118,12 @@ node /wordpress/ inherits base { } +# default (base) cartridge node +node /default/ inherits base { + require java + class {'agent':} +} + # stratos components related nodes # not supported in alpha version. node 'autoscaler.wso2.com' inherits base {
