You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2014/03/31 07:07:30 UTC

[12/12] git commit: Removed puppet as now we are using puppet3

Removed puppet as now we are using puppet3


Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/6089f8a6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/6089f8a6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/6089f8a6

Branch: refs/heads/master
Commit: 6089f8a699da058a51420719352e4c320bad8060
Parents: e3da9da
Author: M. Isuru Tharanga Chrishantha Perera <is...@apache.org>
Authored: Mon Mar 31 10:24:06 2014 +0530
Committer: M. Isuru Tharanga Chrishantha Perera <is...@apache.org>
Committed: Mon Mar 31 10:24:06 2014 +0530

----------------------------------------------------------------------
 tools/puppet/agent/etc/rc.local                 |  26 -
 tools/puppet/agent/root/bin/ec2_init.sh         | 149 ----
 tools/puppet/agent/ruby/stratos_sendinfo.rb     |  30 -
 .../puppet/etc/puppet/files/cartridge-agent.sh  | 117 ---
 tools/puppet/etc/puppet/files/environment       |  22 -
 .../etc/puppet/files/get-launch-params.rb       |  54 --
 tools/puppet/etc/puppet/fileserver.conf         |  35 -
 tools/puppet/manifests/classes/apt.pp           |  43 --
 tools/puppet/manifests/classes/hosts.pp         |  29 -
 tools/puppet/manifests/classes/java.pp          |  65 --
 tools/puppet/manifests/classes/lb_cartridge.pp  | 139 ----
 tools/puppet/manifests/classes/mcollective.pp   |  84 ---
 tools/puppet/manifests/classes/mysql.pp         | 122 ----
 tools/puppet/manifests/classes/php_cartridge.pp | 148 ----
 tools/puppet/manifests/classes/ssh.pp           |  61 --
 tools/puppet/manifests/classes/stratos.pp       |  93 ---
 tools/puppet/manifests/classes/system_config.pp |  77 --
 tools/puppet/manifests/nodes.pp                 | 135 ----
 .../puppet/manifests/nodes.pp.sample.multinode  | 107 ---
 .../puppet/manifests/nodes.pp.sample.singlenode | 112 ---
 tools/puppet/manifests/site.pp                  |  23 -
 tools/puppet/modules/agent/LICENSE              |  16 -
 tools/puppet/modules/agent/manifests/init.pp    |  76 --
 .../modules/agent/manifests/initialize.pp       |  63 --
 .../modules/agent/manifests/push_templates.pp   |  31 -
 tools/puppet/modules/agent/manifests/start.pp   |  31 -
 .../modules/agent/templates/bin/stratos.sh.erb  |  44 --
 .../conf/templates/jndi.properties.template.erb |  26 -
 .../templates/extensions/addons/_mysql.erb      |  21 -
 .../templates/extensions/addons/_nodejs.erb     |   4 -
 .../agent/templates/extensions/addons/_php.erb  |   1 -
 .../extensions/artifacts-updated.sh.erb         |  33 -
 .../agent/templates/extensions/clean.sh.erb     |  28 -
 .../extensions/instance-activated.sh.erb        |  28 -
 .../extensions/instance-started.sh.erb          |  33 -
 .../templates/extensions/start-servers.sh.erb   |  31 -
 tools/puppet/modules/apt/files/90forceyes       |  23 -
 tools/puppet/modules/autoscaler/LICENSE         |  16 -
 .../autoscaler/files/configs/bin/stratos.sh     | 298 --------
 .../modules/autoscaler/manifests/clean.pp       |  50 --
 .../modules/autoscaler/manifests/deploy.pp      |  47 --
 .../puppet/modules/autoscaler/manifests/init.pp | 102 ---
 .../modules/autoscaler/manifests/initialize.pp  |  64 --
 .../modules/autoscaler/manifests/params.pp      |  43 --
 .../autoscaler/manifests/push_templates.pp      |  31 -
 .../modules/autoscaler/manifests/start.pp       |  33 -
 .../templates/conf/autoscaler.xml.erb           |  42 --
 .../templates/conf/axis2/axis2.xml.erb          | 701 ------------------
 .../autoscaler/templates/conf/carbon.xml.erb    | 625 ----------------
 .../templates/conf/jndi.properties.erb          |   4 -
 tools/puppet/modules/cc/LICENSE                 |  16 -
 tools/puppet/modules/cc/manifests/clean.pp      |  49 --
 tools/puppet/modules/cc/manifests/deploy.pp     |  47 --
 tools/puppet/modules/cc/manifests/init.pp       | 102 ---
 tools/puppet/modules/cc/manifests/initialize.pp |  63 --
 tools/puppet/modules/cc/manifests/params.pp     |  71 --
 .../modules/cc/manifests/push_templates.pp      |  31 -
 tools/puppet/modules/cc/manifests/start.pp      |  32 -
 .../cc/templates/conf/axis2/axis2.xml.erb       | 703 ------------------
 .../modules/cc/templates/conf/carbon.xml.erb    | 625 ----------------
 .../cc/templates/conf/cloud-controller.xml.erb  |  61 --
 .../cc/templates/conf/cloud-controller/_ec2.erb |  13 -
 .../conf/cloud-controller/_openstack.erb        |  14 -
 .../cc/templates/conf/jndi.properties.erb       |   4 -
 tools/puppet/modules/cep/LICENSE                |  13 -
 .../modules/cep/files/configs/bin/wso2server.sh | 304 --------
 .../dropins/activemq_client_5.8.0_1.0.0.jar     | Bin 1032400 -> 0 bytes
 .../dropins/andes_client_0.13.wso2v8_1.0.0.jar  | Bin 1854829 -> 0 bytes
 ...che.stratos.cep.extension-1.0.0-SNAPSHOT.jar | Bin 16495 -> 0 bytes
 .../repository/conf/siddhi/siddhi.extension     |   3 -
 .../repository/conf/stream-manager-config.xml   | 269 -------
 .../HealthStatisticsEventBuilder.xml            |  10 -
 .../InstanceStatusStatisticsBuilder.xml         |  10 -
 .../LoadBalancerStatisticsEventBuilder.xml      |  10 -
 .../AverageInFlightRequestsEventFormatter.xml   |  11 -
 .../AverageLoadAverageEventFormatter.xml        |  11 -
 .../AverageMemoryConsumptionEventFormatter.xml  |  11 -
 .../FaultMessageEventFormatter.xml              |  11 -
 .../GradientInFlightRequestsEventFormatter.xml  |  11 -
 .../GradientLoadAverageEventFormatter.xml       |  11 -
 .../GradientMemoryConsumptionEventFormatter.xml |  11 -
 .../MemberAverageLoadAverageEventFormatter.xml  |  11 -
 ...erAverageMemoryConsumptionEventFormatter.xml |  11 -
 .../MemberGradientLoadAverageEventFormatter.xml |  11 -
 ...rGradientMemoryConsumptionEventFormatter.xml |  11 -
 ...econdDerivativeLoadAverageEventFormatter.xml |  11 -
 ...erivativeMemoryConsumptionEventFormatter.xml |  11 -
 ...DerivativeInFlightRequestsEventFormatter.xml |  11 -
 ...econdDerivativeLoadAverageEventFormatter.xml |  11 -
 ...erivativeMemoryConsumptionEventFormatter.xml |  11 -
 .../executionplans/AverageHeathRequest.xml      |  29 -
 .../AverageInFlightRequestsFinder.xml           |  19 -
 .../executionplans/GradientOfHealthRequest.xml  |  30 -
 .../GradientOfRequestsInFlightFinder.xml        |  18 -
 .../SecondDerivativeOfHealthRequest.xml         |  27 -
 ...SecondDerivativeOfRequestsInFlightFinder.xml |  19 -
 .../DefaultWSO2EventInputAdaptor.xml            |   3 -
 .../DefaultWSO2EventOutputAdaptor.xml           |   8 -
 .../outputeventadaptors/JMSOutputAdaptor.xml    |   8 -
 tools/puppet/modules/cep/manifests/clean.pp     |  45 --
 tools/puppet/modules/cep/manifests/deploy.pp    |  43 --
 tools/puppet/modules/cep/manifests/init.pp      | 101 ---
 .../puppet/modules/cep/manifests/initialize.pp  |  59 --
 tools/puppet/modules/cep/manifests/params.pp    |  69 --
 .../modules/cep/manifests/push_templates.pp     |  26 -
 tools/puppet/modules/cep/manifests/start.pp     |  27 -
 .../cep/templates/conf/axis2/axis2.xml.erb      | 698 ------------------
 .../modules/cep/templates/conf/carbon.xml.erb   | 609 ----------------
 .../cep/templates/conf/jndi.properties.erb      |  32 -
 .../JMSOutputAdaptor.xml.erb                    |   8 -
 .../modules/commons/files/bin/puppet_init.sh    |  53 --
 .../modules/commons/files/bin/sign_jars.sh      |  39 -
 .../configs/bin/native/wrapper-linux-x86-32     | Bin 111027 -> 0 bytes
 .../commons/files/configs/lib/home/favicon.ico  | Bin 1150 -> 0 bytes
 tools/puppet/modules/commons/files/environment  |  23 -
 tools/puppet/modules/haproxy/LICENSE            |  16 -
 tools/puppet/modules/haproxy/manifests/init.pp  |  71 --
 .../modules/haproxy/manifests/initialize.pp     |  64 --
 .../modules/haproxy/manifests/push_templates.pp |  31 -
 tools/puppet/modules/haproxy/manifests/start.pp |  31 -
 .../templates/bin/haproxy-extension.sh.erb      |  48 --
 .../haproxy/templates/conf/jndi.properties.erb  |  23 -
 .../java/files/jars/copy_java_patches_here      |  22 -
 .../java/files/jdk-7u7-linux-x64.tar.gz.file    |  22 -
 tools/puppet/modules/lb/LICENSE                 |  16 -
 tools/puppet/modules/lb/manifests/clean.pp      |  50 --
 tools/puppet/modules/lb/manifests/deploy.pp     |  48 --
 tools/puppet/modules/lb/manifests/init.pp       |  95 ---
 tools/puppet/modules/lb/manifests/initialize.pp |  64 --
 tools/puppet/modules/lb/manifests/params.pp     |  43 --
 .../modules/lb/manifests/push_templates.pp      |  31 -
 tools/puppet/modules/lb/manifests/start.pp      |  32 -
 .../lb/templates/conf/axis2/axis2.xml.erb       | 527 --------------
 .../lb/templates/conf/loadbalancer.conf.erb     | 142 ----
 tools/puppet/modules/manager/LICENSE            |  16 -
 tools/puppet/modules/manager/README             |   3 -
 .../lib/copy_mysql-connector-jar_here           |   0
 tools/puppet/modules/manager/manifests/clean.pp |  49 --
 .../puppet/modules/manager/manifests/deploy.pp  |  48 --
 tools/puppet/modules/manager/manifests/init.pp  | 104 ---
 .../modules/manager/manifests/initialize.pp     |  63 --
 .../puppet/modules/manager/manifests/params.pp  |  46 --
 .../modules/manager/manifests/push_templates.pp |  31 -
 tools/puppet/modules/manager/manifests/start.pp |  33 -
 .../manager/templates/conf/axis2/axis2.xml.erb  | 702 ------------------
 .../manager/templates/conf/carbon.xml.erb       | 625 ----------------
 .../conf/cartridge-config.properties.erb        |  73 --
 .../conf/datasources/master-datasources.xml.erb |  27 -
 .../datasources/stratos-datasources.xml.erb     |  66 --
 .../manager/templates/conf/jndi.properties.erb  |   4 -
 tools/puppet/modules/messagebroker/LICENSE      |  13 -
 .../files/configs/bin/wso2server.sh             | 300 --------
 .../modules/messagebroker/manifests/clean.pp    |  45 --
 .../modules/messagebroker/manifests/deploy.pp   |  43 --
 .../modules/messagebroker/manifests/init.pp     |  99 ---
 .../messagebroker/manifests/initialize.pp       |  59 --
 .../modules/messagebroker/manifests/params.pp   |  66 --
 .../messagebroker/manifests/push_templates.pp   |  26 -
 .../modules/messagebroker/manifests/start.pp    |  27 -
 .../templates/conf/axis2/axis2.xml.erb          | 719 -------------------
 .../messagebroker/templates/conf/carbon.xml.erb | 583 ---------------
 .../php_cartridge/etc/apache2/apache2.conf.erb  | 256 -------
 .../etc/apache2/sites-available/default-ssl.erb | 195 -----
 .../etc/apache2/sites-available/default.erb     |  64 --
 164 files changed, 14596 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6089f8a6/tools/puppet/agent/etc/rc.local
----------------------------------------------------------------------
diff --git a/tools/puppet/agent/etc/rc.local b/tools/puppet/agent/etc/rc.local
deleted file mode 100644
index 4f4291d..0000000
--- a/tools/puppet/agent/etc/rc.local
+++ /dev/null
@@ -1,26 +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.
-#
-# --------------------------------------------------------------
-
-/root/bin/ec2_init.sh > /tmp/puppet_log
-
-exit 0
-

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6089f8a6/tools/puppet/agent/root/bin/ec2_init.sh
----------------------------------------------------------------------
diff --git a/tools/puppet/agent/root/bin/ec2_init.sh b/tools/puppet/agent/root/bin/ec2_init.sh
deleted file mode 100644
index 1fe63bb..0000000
--- a/tools/puppet/agent/root/bin/ec2_init.sh
+++ /dev/null
@@ -1,149 +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.
-#
-# This script will read SERVICE from the payload
-# and do the following.
-# - Set the hostname of the instance.
-# - Configure the Puppet agent and restart the service.
-# - Fetch deployment instructions and configs for this host
-#   from the Puppet master.
-#
-# --------------------------------------------------------------
-
-MKDIR=`which mkdir`
-UNZIP=`which unzip`
-ECHO=`which echo`
-FIND=`which find`
-GREP=`which grep`
-RM=`which rm`
-XARGS=`which xargs`
-SED=`which sed`
-CUT=`which cut`
-AWK=`which awk`
-IFCONFIG=`which ifconfig`
-HOSTNAME=`which hostname`
-SLEEP=`which sleep`
-TR=`which tr`
-HEAD=`which head`
-WGET=`which wget`
-PUPPETD=`which puppetd`
-
-COMMAND="${PUPPETD} -vt"
-IP=`${IFCONFIG} eth0 | ${GREP} -e "inet addr" | ${AWK} '{print $2}' | ${CUT} -d ':' -f 2`
-LOG=/tmp/puppet-init.log
-
-HOSTSFILE=/etc/hosts
-HOSTNAMEFILE=/etc/hostname
-
-read_master() {
-#	local COUNT=0
-#	[ ${COUNT} == 10 ] && exit 1 || true
-	${COMMAND}
-#	[ $? == 0 ] && true || (read_master ; COUNT=`expr ${COUNT} + 1`)
-}
-
-
-is_public_ip_assigned() {
-
-while true
-do
-   wget http://169.254.169.254/latest/meta-data/public-ipv4
-   if [ ! -f public-ipv4 ]
-        then
-                echo "Public ipv4 file not found. Sleep and retry" >> $LOG
-                sleep 2;
-                continue;
-        else
-                "public-ipv4 file is available. Read value" >> $LOG
-
-                # Here means file is available. Read the file
-                read -r ip<public-ipv4;
-                echo "Empty value is **$ip** " >> $LOG
-
-                if [ -z "$ip" ]
-                   then
-                         echo "File is empty. Retry...." >> $LOG
-                         sleep 2
-                         rm public-ipv4
-                         continue
-                   else
-                         echo "public ip is assigned.. value is [$ip]. Remove file" >> $LOG
-                         rm public-ipv4
-                         break
-                fi
-        fi
-done
-}
-
-
-DATE=`date +%d%m%y%S`
-RANDOMNUMBER="`${TR} -c -d 0-9 < /dev/urandom | ${HEAD} -c 4`${DATE}"
-
-if [ ! -d /tmp/payload ]; then
-
-	## Check whether the public ip is assigned
-	is_public_ip_assigned
-
-	"Public ip have assigned. Continue.." >> $LOG
-
-	## Clean old poop
-	${ECHO} "Removing all existing certificates .."
-	#${FIND} /var/lib/puppet -type f -print0 | ${XARGS} -0r ${RM}
-
-	${MKDIR} -p /tmp/payload
-	${WGET} http://169.254.169.254/latest/user-data -O /tmp/payload/launch-params
-
-	cd /tmp/payload
-	SERVICE_NAME=`sed 's/,/\n/g' launch-params | grep SERVICE_NAME | cut -d "=" -f 2`
-	DEPLOYMENT=`sed 's/,/\n/g' launch-params | grep DEPLOYMENT | cut -d "=" -f 2`
-	INSTANCE_HOSTNAME=`sed 's/,/\n/g' launch-params | grep HOSTNAME | cut -d "=" -f 2`
-	#CLUSTER=`sed 's/,/\n/g' launch-params | grep CLUSTER | cut -d "=" -f 2`
-	PUPPET_IP=`sed 's/,/\n/g' launch-params | grep PUPPET_IP | cut -d "=" -f 2`
-	HOST="${RANDOMNUMBER}.${DEPLOYMENT}.${SERVICE_NAME}"
-	${ECHO} -e "\nNew hostname ${HOST}\n"
-
-	## Set the hostname
-	${HOSTNAME} ${HOST}
-	${ECHO} "${HOST}" > ${HOSTNAMEFILE}
-#	${ECHO} "${IP}  ${HOST}" >> ${HOSTSFILE}
-	#${ECHO} "${IP} local.${INSTANCE_HOSTNAME}" >> ${HOSTSFILE} 
-	#${ECHO} "${IP} bind.${INSTANCE_HOSTNAME}" >> ${HOSTSFILE}
-	#${ECHO} "${PUPPET_IP} ${INSTANCE_HOSTNAME}" >> ${HOSTSFILE}
-	${ECHO} "${PUPPET_IP}  s2demo.s2.wso2.com" >> ${HOSTSFILE} 
-	/etc/init.d/hostname start
-
-#	## Enable and restart Puppet
-#	${SED} -i /etc/default/puppet -e 's/START=no/START=yes/'
-	/etc/init.d/puppet stop
-
-	${SLEEP} 5
-	
-	${PUPPETD} --enable
-    
-	read_master
-
-#	${SLEEP} 15m
-
-	${PUPPETD} --disable
-
-    #${ECHO} "* * * * * root /root/bin/cron-hosts.sh" >> /etc/crontab
-fi
-
-# END

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6089f8a6/tools/puppet/agent/ruby/stratos_sendinfo.rb
----------------------------------------------------------------------
diff --git a/tools/puppet/agent/ruby/stratos_sendinfo.rb b/tools/puppet/agent/ruby/stratos_sendinfo.rb
deleted file mode 100644
index 1ab3a9b..0000000
--- a/tools/puppet/agent/ruby/stratos_sendinfo.rb
+++ /dev/null
@@ -1,30 +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.
-#
-# --------------------------------------------------------------
-
-
-configs = File.read("/tmp/payload/launch-params").split(",").map(&:strip)
-
-configs.each { |x| key_value_pair = x.split("=").map(&:strip)
-        Facter.add("stratos_instance_data_" + key_value_pair[0].to_s){
-                 setcode { key_value_pair[1].to_s
-                }
-        }
- }

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6089f8a6/tools/puppet/etc/puppet/files/cartridge-agent.sh
----------------------------------------------------------------------
diff --git a/tools/puppet/etc/puppet/files/cartridge-agent.sh b/tools/puppet/etc/puppet/files/cartridge-agent.sh
deleted file mode 100755
index 3744496..0000000
--- a/tools/puppet/etc/puppet/files/cartridge-agent.sh
+++ /dev/null
@@ -1,117 +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.
-#
-# --------------------------------------------------------------
-
-# This script will be called from /etc/rc.local when the cartridge
-# instance is spawned. It will initiate all the tasks that needs to 
-# be run to bring the cartridge instance to operational state.
-
-source /etc/environment
-
-set -e # Terminate on any error
-export LOG=/var/log/apache-stratos/cartridge-agent-sh.log
-instance_path=/opt/apache-stratos-cartridge-agent # Cartridge agent home
-ca_exec_path=${instance_path}/cartridge-agent # Cartridge agent executable home
-temp_payload_path=/tmp/payload/launch-params
-puppet_payload_path=/tmp/puppet-payload
-cartridge_agent_script=stratos.sh
-truststore_path=/opt/apache-stratos-cartridge-agent/cartridge-agent/security
-
-#---------------------------------------------
-# Unzip cartridge agent pack
-#---------------------------------------------
-pushd ${instance_path}
-unzip apache-stratos-cartridge-agent-4.0.0-SNAPSHOT-bin.zip
-mv apache-stratos-cartridge-agent-4.0.0-SNAPSHOT cartridge-agent
-popd
-
-# ---------------------------------------------
-# Download payload
-# ---------------------------------------------
-if [ ! -d ${instance_path}/payload ]; then
-    echo "creating payload directory... " | tee -a $LOG
-    mkdir ${instance_path}/payload
-    echo "payload directory created" | tee -a $LOG
-    #wget http://169.254.169.254/latest/user-data -O ${instance_path}/payload/launch-params -- payload already downloaded
-    #echo "payload copied"  | tee -a $LOG
-
-    # Concat puppet payload and instance payload into ${instance_path}/payload/launch-params
-    #Read puppet configs
-    puppet_config=`cat /tmp/puppet-payload`
-    echo "puppet_config"
-    sed "s|$|${puppet_config}|" ${temp_payload_path} > ${instance_path}/payload/launch-params
-
-    for i in `/usr/bin/ruby ${instance_path}/get-launch-params.rb`
-    do
-        # Add double quotes on both sides of the value
-        value=`echo "${i}" | sed -e s@=@=\"@g`
-        value=${value}"\""
-        if [[ ${value} == PORTS* ]]; then
-            # Replace port separator | with ,
-            value=`echo ${value} | sed -e s@'|'@,@g`
-        fi
-        echo "writing to launch.params ${value}" | tee -a $LOG
-        echo "export" ${value} >> ${instance_path}/launch.params
-    done
-
-fi
-
-source ${instance_path}/launch.params
-
-pushd $ca_exec_path
-echo "Configuring cartridge agent executable..." | tee -a $LOG
-cp -f bin/$cartridge_agent_script bin/$cartridge_agent_script.tmp
-cat bin/$cartridge_agent_script.tmp | sed -e "s@MB-IP@$MB_IP@g" > bin/$cartridge_agent_script
-cp -f bin/$cartridge_agent_script bin/$cartridge_agent_script.tmp
-cat bin/$cartridge_agent_script.tmp | sed -e "s@MB-PORT@$MB_PORT@g" > bin/$cartridge_agent_script
-cp -f bin/$cartridge_agent_script bin/$cartridge_agent_script.tmp
-cat bin/$cartridge_agent_script.tmp | sed -e "s@CEP-IP@$CEP_IP@g" > bin/$cartridge_agent_script
-cp -f bin/$cartridge_agent_script bin/$cartridge_agent_script.tmp
-cat bin/$cartridge_agent_script.tmp | sed -e "s@CEP-PORT@$CEP_PORT@g" > bin/$cartridge_agent_script
-cp -f bin/$cartridge_agent_script bin/$cartridge_agent_script.tmp
-cat bin/$cartridge_agent_script.tmp | sed -e "s@CERT-TRUSTSTORE@$truststore_path/$CERT_TRUSTSTORE@g" > bin/$cartridge_agent_script
-cp -f bin/$cartridge_agent_script bin/$cartridge_agent_script.tmp
-cat bin/$cartridge_agent_script.tmp | sed -e "s@\bTRUSTSTORE-PASSWORD\b@$TRUSTSTORE_PASSWORD@g" > bin/$cartridge_agent_script
-cp -f bin/$cartridge_agent_script bin/$cartridge_agent_script.tmp
-cat bin/$cartridge_agent_script.tmp | sed -e "s@\bENABLE-DATA-PUBLISHER\b@$ENABLE_DATA_PUBLISHER@g" > bin/$cartridge_agent_script
-cp -f bin/$cartridge_agent_script bin/$cartridge_agent_script.tmp
-cat bin/$cartridge_agent_script.tmp | sed -e "s@\bMONITORING-SERVER-IP\b@$MONITORING_SERVER_IP@g" > bin/$cartridge_agent_script
-cp -f bin/$cartridge_agent_script bin/$cartridge_agent_script.tmp
-cat bin/$cartridge_agent_script.tmp | sed -e "s@\bMONITORING-SERVER-PORT\b@$MONITORING_SERVER_PORT@g" > bin/$cartridge_agent_script
-cp -f bin/$cartridge_agent_script bin/$cartridge_agent_script.tmp
-cat bin/$cartridge_agent_script.tmp | sed -e "s@\bMONITORING-SERVER-SECURE-PORT\b@$MONITORING_SERVER_SECURE_PORT@g" > bin/$cartridge_agent_script
-cp -f bin/$cartridge_agent_script bin/$cartridge_agent_script.tmp
-cat bin/$cartridge_agent_script.tmp | sed -e "s@\bMONITORING-SERVER-ADMIN-USERNAME\b@$MONITORING_SERVER_ADMIN_USERNAME@g" > bin/$cartridge_agent_script
-cp -f bin/$cartridge_agent_script bin/$cartridge_agent_script.tmp
-cat bin/$cartridge_agent_script.tmp | sed -e "s@\bMONITORING-SERVER-ADMIN-PASSWORD\b@$MONITORING_SERVER_ADMIN_PASSWORD@g" > bin/$cartridge_agent_script
-
-rm -f bin/$cartridge_agent_script.tmp
-popd
-
-
-#------------------------------------
-# Starting cartridge agent executable
-#------------------------------------
-pushd $ca_exec_path
-echo "Starting cartridge agent..." | tee -a $LOG
-sh bin/$cartridge_agent_script &
-popd
-

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6089f8a6/tools/puppet/etc/puppet/files/environment
----------------------------------------------------------------------
diff --git a/tools/puppet/etc/puppet/files/environment b/tools/puppet/etc/puppet/files/environment
deleted file mode 100644
index f2e160b..0000000
--- a/tools/puppet/etc/puppet/files/environment
+++ /dev/null
@@ -1,22 +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.
-#
-# --------------------------------------------------------------
-PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/opt/java/bin"
-JAVA_HOME="/opt/java"

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6089f8a6/tools/puppet/etc/puppet/files/get-launch-params.rb
----------------------------------------------------------------------
diff --git a/tools/puppet/etc/puppet/files/get-launch-params.rb b/tools/puppet/etc/puppet/files/get-launch-params.rb
deleted file mode 100644
index 0631b2b..0000000
--- a/tools/puppet/etc/puppet/files/get-launch-params.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-#! /usr/bin/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.
-#
-# --------------------------------------------------------------
-
-### get-launch-params.rb
-
-# The following script obtains the launch parameters from 
-# the file /tmp/payload/launch-params, then parses out the 
-# parameters for this instance by using the launch index
-# of this particular EC2 instance.
-#
-# Pass the command the -e flag to output the instance 
-# parameters as exports of shell variables. Any other 
-# arguments are ignored.
-
-def get_launch_params(launch_params_file)
-  IO.readlines launch_params_file
-end
-
-export_stmt = ""
-
-launch_params = get_launch_params(
-  "/opt/apache-stratos-cartridge-agent/payload/launch-params")
-
-if launch_params.length > 0
-  instance_params_str = launch_params[0]
-
-  instance_params = instance_params_str.split(',')
-
-  export_stmt = "export " if ARGV.length > 0 && ARGV.include?("-e")
-
-  instance_params.each { |param|
-    puts export_stmt + param
-  }
-
-end

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6089f8a6/tools/puppet/etc/puppet/fileserver.conf
----------------------------------------------------------------------
diff --git a/tools/puppet/etc/puppet/fileserver.conf b/tools/puppet/etc/puppet/fileserver.conf
deleted file mode 100644
index 47b46ef..0000000
--- a/tools/puppet/etc/puppet/fileserver.conf
+++ /dev/null
@@ -1,35 +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.
-#
-# --------------------------------------------------------------
-
-[files]
-   path /etc/puppet/
-   allow *
-
-[plugins]
-   allow *
-
-[stratos2]
-  path /mnt/puppet/stratos2/
-  allow *
-
-[commons]
-  path /etc/puppet/files
-  allow *

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6089f8a6/tools/puppet/manifests/classes/apt.pp
----------------------------------------------------------------------
diff --git a/tools/puppet/manifests/classes/apt.pp b/tools/puppet/manifests/classes/apt.pp
deleted file mode 100755
index 66ee782..0000000
--- a/tools/puppet/manifests/classes/apt.pp
+++ /dev/null
@@ -1,43 +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 apt {
-#	$packages = ["lsof","unzip","sysstat","telnet","nmap","less","nagios-nrpe-server","ganglia-monitor"]
-	$packages = ["lsof","unzip","sysstat","telnet","nmap","less"]
-
-        file { "/etc/apt/apt.conf.d/90forceyes":
-                ensure  => present,
-                source  => "puppet:///apt/90forceyes";
-        }
-
-#        exec { "update-apt":
-#                path    => ['/bin', '/usr/bin'],
-#                command => "apt-get update > /dev/null 2>&1 &",
-#                require => File["/etc/apt/apt.conf.d/90forceyes"],
-#        }
-
-        package { $packages:
-                provider        => apt,
-                ensure          => installed,
-                require         => File["/etc/apt/apt.conf.d/90forceyes"],
-        }	
-}

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6089f8a6/tools/puppet/manifests/classes/hosts.pp
----------------------------------------------------------------------
diff --git a/tools/puppet/manifests/classes/hosts.pp b/tools/puppet/manifests/classes/hosts.pp
deleted file mode 100755
index 8e4ef3e..0000000
--- a/tools/puppet/manifests/classes/hosts.pp
+++ /dev/null
@@ -1,29 +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 hosts {
-    file { "/etc/hosts":
-        owner   => root,
-        group   => root,
-        mode    => 775,
-        content	=> template("hosts.erb"),
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6089f8a6/tools/puppet/manifests/classes/java.pp
----------------------------------------------------------------------
diff --git a/tools/puppet/manifests/classes/java.pp b/tools/puppet/manifests/classes/java.pp
deleted file mode 100755
index a9acf8e..0000000
--- a/tools/puppet/manifests/classes/java.pp
+++ /dev/null
@@ -1,65 +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 java { 
-
-	$java_home 	= "jdk1.7.0_07"
-	$package 	= "jdk-7u7-linux-x64.tar.gz"
-
-	file {  "/opt/${package}":
-		owner	=> root,
-		group	=> root,
-		mode	=> 755,
-		source	=> "puppet:///java/${package}",
-		ignore	=> ".svn",
-		ensure  => present;
-
-		"/opt/java/jre/lib/security/":
-                owner   => root,
-                group   => root,
-                source  => ["puppet:///java/jars/"],
-		ignore	=> ".svn",
-                ensure  => present,
-                recurse => true,
-                require => File["/opt/java"];
-
-		"/opt/java":
-		ensure 	=> link,
-		target	=> "/opt/${java_home}",
-		require	=> Exec["install_java"];
-
-		"/etc/environment":
-		owner => root,
-		group => root,
-		source => 'puppet:///commons/environment';
-	}
-    
-	exec {  "install_java":
-		cwd	=> "/opt",
-		command => "/bin/tar xzf ${package}",
-		unless	=> "/usr/bin/test -d /opt/${java_home}",
-		creates	=> "/opt/${java_home}/COPYRIGHT",
-		require	=> File["/opt/${package}"],
-	} 
-
-
-}
- 

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6089f8a6/tools/puppet/manifests/classes/lb_cartridge.pp
----------------------------------------------------------------------
diff --git a/tools/puppet/manifests/classes/lb_cartridge.pp b/tools/puppet/manifests/classes/lb_cartridge.pp
deleted file mode 100644
index adbd8cf..0000000
--- a/tools/puppet/manifests/classes/lb_cartridge.pp
+++ /dev/null
@@ -1,139 +0,0 @@
-class stratos::lb ( $version, 
-		   $offset=0, 
-		   $tribes_port=4000, 
-		   $config_db=governance, 
-		   $maintenance_mode=true, 
-		   $owner=root,
-		   $group=root,
-		   $adc_host="lb.strato.org",
-                   $adc_port=9445,
-		   $target="/opt",
-		   $cartridge_type,
-		   $generic, 
-	           $mb_ip,
-                   $mb_port,
-                   $cep_ip,
-                   $cep_port,
-                   $cert_truststore,
-                   $truststore_password,
-		   $enable_data_publishing,
-		   $monitoring_server_ip,
-		   $monitoring_server_port,
-		   $monitoring_server_secure_port,
-		   $monitoring_server_admin_username,
-		   $monitoring_server_admin_password) {
-	
-	
-	$deployment_code	= "load-balancer"
-
-	$stratos_version 	= $version
-	$service_code 		= "load-balancer"
-	$carbon_home		= "${target}/apache-stratos-load-balancer-${stratos_version}"
-	$mgt_port		= 8280 + $offset
-
-
-        $common_templates      =  [
-				#	"conf/datasources/master-datasources.xml",
-				#	"conf/etc/logging-config.xml",
-				#	"conf/log4j.properties"
-				]
-
-
-	tag ($service_code)
-
-       define push_templates ( $directory, $target ) {
-       
-             #  file { "${target}/repository/${name}":
-             #          owner   => $owner,
-             #          group   => $group,
-             #          mode    => 755,
-             #          content => template("${directory}/${name}.erb"),
-             #          ensure  => present,
-             #  }
-       }
-
-	clean { $deployment_code:
-		mode		=> $maintenance_mode,
-                target          => $carbon_home,
-	}
-
-	initialize { $deployment_code:
-		version         => $stratos_version,
-		mode		=> $maintenance_mode,
-		service		=> $service_code,
-		local_dir       => $local_package_dir,
-		owner		=> $owner,
-		target   	=> $target,
-		require		=> Stratos::Clean[$deployment_code],
-	}
-
-	deploy { $deployment_code:
-		service		=> $service_code,	
-		security	=> "true",
-		owner		=> $owner,
-		group		=> $group,
-		target		=> $carbon_home,
-		require		=> Stratos::Initialize[$deployment_code],
-	}
-
-
-	
-	push_templates { 
-		$service_templates: 
-		target		=> $carbon_home,
-		directory 	=> $service_code,
-		require 	=> Stratos::Deploy[$deployment_code];
-
-		$common_templates:
-		target          => $carbon_home,
-                directory       => "commons",
-		require 	=> Stratos::Deploy[$deployment_code],
-	}
-
-	start { $deployment_code:
-		owner		=> $owner,
-                target          => $carbon_home,
-		require		=> [ Stratos::Initialize[$deployment_code],
-				     Push_templates[$service_templates],
-				     Push_templates[$common_templates], 
-				   ],
-	}
-
-        file {  "/opt/apache-stratos-cartridge-agent":
-                ensure  => directory 
-        }
-
-
-	file {  "/opt/apache-stratos-cartridge-agent/apache-stratos-cartridge-agent-4.0.0-SNAPSHOT-bin.zip":
-                source          => "puppet:///commons/apache-stratos-cartridge-agent-4.0.0-SNAPSHOT-bin.zip",
-                ensure          => present,
-        }
-
-
-        file {  "/opt/apache-stratos-cartridge-agent/cartridge-agent.sh":
-                source          => "puppet:///commons/cartridge-agent.sh",
-                ensure          => present,
-        }
-
-
-        file {  "/opt/apache-stratos-cartridge-agent/get-launch-params.rb":
-                source          => "puppet:///commons/get-launch-params.rb",
-                ensure          => present,
-        }
-
-
-        file {"/tmp/puppet-payload":
-                 ensure  => present,
-                 content => ",MB_IP=${mb_ip},MB_PORT=${mb_port},CEP_IP=${cep_ip},CEP_PORT=${cep_port},CERT_TRUSTSTORE=${cert_truststore},TRUSTSTORE_PASSWORD=${truststore_password},ENABLE_DATA_PUBLISHER=${enable_data_publishing},MONITORING_SERVER_IP=${monitoring_server_ip},MONITORING_SERVER_PORT=${monitoring_server_port},MONITORING_SERVER_SECURE_PORT=${monitoring_server_secure_port},MONITORING_SERVER_ADMIN_USERNAME=${monitoring_server_admin_username},MONITORING_SERVER_ADMIN_PASSWORD=${monitoring_server_admin_password}",
-	}
-
-        exec {"run_agent_script-$deployment_code":
-                command => "/opt/apache-stratos-cartridge-agent/cartridge-agent.sh",
-                require => File["/tmp/puppet-payload",
-		"/opt/apache-stratos-cartridge-agent/apache-stratos-cartridge-agent-4.0.0-SNAPSHOT-bin.zip",
-		"/opt/apache-stratos-cartridge-agent/cartridge-agent.sh",
-		"/opt/apache-stratos-cartridge-agent/get-launch-params.rb"];
-        }
-
-}
-

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6089f8a6/tools/puppet/manifests/classes/mcollective.pp
----------------------------------------------------------------------
diff --git a/tools/puppet/manifests/classes/mcollective.pp b/tools/puppet/manifests/classes/mcollective.pp
deleted file mode 100755
index c32d492..0000000
--- a/tools/puppet/manifests/classes/mcollective.pp
+++ /dev/null
@@ -1,84 +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 mcollective {
-
-	$package_list = ["ruby","rubygems","libstomp-ruby"]
-
-	package { $package_list:
-                ensure 		=> installed;
-
-		"mcollective-server":
-                provider 	=> dpkg,
-                ensure 		=> installed,
-                source 		=> "/opt/mcollective/mcollective_2.0.0-2_all.deb",
-                require 	=> [ File["/opt/mcollective/"], Package["mcollective-common"], Class["apt"] ];
-
-                "mcollective-common":
-                provider 	=> dpkg,
-                ensure 		=> installed,
-                source 		=> "/opt/mcollective/mcollective-common_2.0.0-2_all.deb",
-                require 	=> [ File["/opt/mcollective/"], Class["apt"] ],
-
-        }
-	
-        file {  "/etc/mcollective/server.cfg":
-                ensure  	=> present,
-                source 		=> "puppet:///mcollective/config/server.cfg",
-                require 	=> [ Package["mcollective-server"], Package["mcollective-common"] ];
-
-		"/opt/mcollective/":
-                owner   	=> root,
-                group   	=> root,
-                source  	=> "puppet:///mcollective/packages/",
-		ignore		=> ".svn",
-                recurse 	=> true,
-                ensure  	=> present,
-                require 	=> Package[$package_list];
-
-		"/etc/mcollective/facts.yaml":
-                owner    	=> root,
-                group    	=> root,
-                mode     	=> 400,
-                content  	=> inline_template("<%= scope.to_hash.reject { |k,v| k.to_s =~ /(uptime_seconds|timestamp|free)/ }.to_yaml %>"),
-                require 	=> [ Package["mcollective-server"], Package["mcollective-common"] ];
-
-		"/usr/share/mcollective/plugins/mcollective/agent/":
-                owner   	=> root,
-                group   	=> root,
-		mode		=> 644,
-                source  	=> ["puppet:///mcollective/agents/puppet/",
-                		    "puppet:///mcollective/agents/package/",
-                		    "puppet:///mcollective/agents/nettest/",
-                		    "puppet:///mcollective/agents/process/"],
-		sourceselect	=> all,
-		ignore		=> ".svn",
-                recurse 	=> true,
-                ensure  	=> present,
-                require 	=> [ File["/opt/mcollective/"], Package["mcollective-common"], Package["mcollective-server"] ],
-
-        }
-
-	exec { "restart_mcollective":
-		command 	=> "/etc/init.d/mcollective restart",
-		require 	=> [ File["/etc/mcollective/server.cfg"], Package["mcollective-server"], Package["mcollective-common"] ],
-	}
-}

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6089f8a6/tools/puppet/manifests/classes/mysql.pp
----------------------------------------------------------------------
diff --git a/tools/puppet/manifests/classes/mysql.pp b/tools/puppet/manifests/classes/mysql.pp
deleted file mode 100644
index 3a6ea9b..0000000
--- a/tools/puppet/manifests/classes/mysql.pp
+++ /dev/null
@@ -1,122 +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 mysql (mb_ip,mb_port,cep_ip,cep_port,cert_truststore,truststore_password,enable_data_publishing,monitoring_server_ip,monitoring_server_port,monitoring_server_secure_port,monitoring_server_admin_username,monitoring_server_admin_password) {
-
-  if $stratos_mysql_password {
-    $root_password = $stratos_mysql_password
-  }
-  else {
-    $root_password = 'root'
-  }
-
-  file { "/etc/apt/apt.conf.d/90forceyes":
-                ensure  => present,
-                source  => "puppet:///apt/90forceyes";
-   }
-
-   exec { "update-apt":
-            path    => ['/bin/', '/sbin/', '/usr/bin/', '/usr/sbin/', '/usr/local/bin/', '/usr/local/sbin/'],
-            command => "apt-get update > /dev/null 2>&1 ",
-            require => File["/etc/apt/apt.conf.d/90forceyes"],
-            logoutput => on_failure,
-   }
-
-  package { ['mysql-server','phpmyadmin','apache2']:
-    ensure => installed,
-    require => Exec["update-apt"],
-  }
-
-  service { 'mysql':
-    ensure  => running,
-    pattern => 'mysql',
-    require => Package['mysql-server'],
-  }
-
-  service { 'apache2':
-    ensure  => running,
-    pattern => 'apache2',
-    require => Package['apache2'],
-  }
-
-#  exec { 'Set root password':
-#    path    => "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
-#    unless  => "mysqladmin -uroot -p${root_password} status",
-#    command => "mysqladmin -uroot password ${root_password}",
-#    require => Service['mysql'];
-#  }
-#
-#  if $root_password {
-#    exec {
-#      'Delete anonymous users':
-#        path    => "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
-#        command => "mysql -uroot -p${root_password} -Bse \"DELETE from mysql.user WHERE password=''\"",
-#        require => Exec['Set root password'];
-#
-#      'Create mysql user root@%':
-#        path    => "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
-#        command => "mysql -uroot -p${root_password} -Bse \"CREATE USER 'root'@'%' IDENTIFIED BY '${root_password}'\"",
-#        require => Exec['Delete anonymous users'];
-#    }
-#  }
-
-#  file { '/etc/httpd/conf.d/phpMyAdmin.conf':
-#    ensure  => present,
-#    content => template('mysql/phpMyAdmin.conf.erb'),
-#    notify  => Service['httpd'],
-#    require => [
-#      Package['phpmyadmin'],
-#      Package['apache2'],
-#    ];
-#  }
-
-
-        file {  "/opt/apache-stratos-cartridge-agent/apache-stratos-cartridge-agent-4.0.0-SNAPSHOT-bin.zip":
-                source          => "puppet:///commons/apache-stratos-cartridge-agent-4.0.0-SNAPSHOT-bin.zip",
-                ensure          => present,
-        }
-
-        file {  "/opt/apache-stratos-cartridge-agent/cartridge-agent.sh":
-                source          => "puppet:///commons/cartridge-agent.sh",
-                ensure          => present,
-        }
-
-
-        file {  "/opt/apache-stratos-cartridge-agent/get-launch-params.rb":
-                source          => "puppet:///commons/get-launch-params.rb",
-                ensure          => present,
-        }
-
-
-        file {"/tmp/puppet-payload":
-                 ensure  => present,
-                 content => ",MB_IP=${mb_ip},MB_PORT=${mb_port},CEP_IP=${cep_ip},CEP_PORT=${cep_port},CERT_TRUSTSTORE=${cert_truststore},TRUSTSTORE_PASSWORD=${truststore_password},APP_PATH=null,ENABLE_DATA_PUBLISHER=${enable_data_publishing},MONITORING_SERVER_IP=${monitoring_server_ip},MONITORING_SERVER_PORT=${monitoring_server_port},MONITORING_SERVER_SECURE_PORT=${monitoring_server_secure_port},MONITORING_SERVER_ADMIN_USERNAME=${monitoring_server_admin_username},MONITORING_SERVER_ADMIN_PASSWORD=${monitoring_server_admin_password}",
-                 require => Service['apache2'];
-        }
-
-        exec {"run_agent_script-$deployment_code":
-                command => "/opt/apache-stratos-cartridge-agent/cartridge-agent.sh",
-                require => File["/tmp/puppet-payload"];
-        }
-
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6089f8a6/tools/puppet/manifests/classes/php_cartridge.pp
----------------------------------------------------------------------
diff --git a/tools/puppet/manifests/classes/php_cartridge.pp b/tools/puppet/manifests/classes/php_cartridge.pp
deleted file mode 100755
index bd2b3e9..0000000
--- a/tools/puppet/manifests/classes/php_cartridge.pp
+++ /dev/null
@@ -1,148 +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 php_cartridge (syslog,docroot,samlalias,serverport,mb_ip,mb_port,cep_ip,cep_port,cert_truststore,truststore_password,enable_data_publishing,monitoring_server_ip,monitoring_server_port,monitoring_server_secure_port,monitoring_server_admin_username,monitoring_server_admin_password){
-	
-	$packages = ["nano","zip","build-essential","mysql-client","apache2","php5","php5-cli","libapache2-mod-php5","php5-gd","php5-mysql","php-db","php-pear","php5-curl","curl","wget","php5-ldap","php5-adodb","mailutils","php5-imap","php5-sqlite","php5-xmlrpc","php5-xsl","openssl","ssl-cert","ldap-utils","php5-mcrypt","mcrypt","ufw","fail2ban","git","libboost-all-dev","ruby"]
-
-        file { "/etc/apt/apt.conf.d/90forceyes":
-                ensure  => present,
-                source  => "puppet:///apt/90forceyes";
-        }
-
-#fix for the apt get failure: multiple paths to 'path'. on a failure, logs are enabled to get an idea of what is wrong.
-
-        exec { "update-apt":
-		path    => ['/bin/', '/sbin/', '/usr/bin/', '/usr/sbin/', '/usr/local/bin/', '/usr/local/sbin/'],
-                command => "apt-get update > /dev/null 2>&1 ",
-                require => File["/etc/apt/apt.conf.d/90forceyes"],
-		logoutput => on_failure,
-        }
-
-        package { $packages:
-                provider        => apt,
-                ensure          => installed,
-                require         => Exec["update-apt"],
-        }	
-	
-	file { 
-		"/etc/apache2/apache2.conf":
-        	owner   => root,
-        	group   => root,
-        	mode    => 775,
-        	content => template("php_cartridge/etc/apache2/apache2.conf.erb"),
-                require         => Package['apache2'];
-    	
-	        "/etc/apache2/sites-available/default":
-        	owner   => root,
-        	group   => root,
-        	mode    => 775,
-        	content => template("php_cartridge/etc/apache2/sites-available/default.erb"),
-                require         => File["/etc/apache2/apache2.conf"];
-	
-		"/etc/apache2/sites-available/default-ssl":
-        	owner   => root,
-        	group   => root,
-        	mode    => 775,
-        	content => template("php_cartridge/etc/apache2/sites-available/default-ssl.erb"),
-                require         => File["/etc/apache2/sites-available/default"];
-    	}
-	
-	exec { "enable ssl module":
-                path    => ['/bin', '/usr/bin','/usr/sbin/'],
-                command => "a2enmod ssl",
-                require         => File["/etc/apache2/sites-available/default-ssl"];
-	
-		"enable ssl":
-                path    => ['/bin', '/usr/bin','/usr/sbin/'],
-                command => "a2enmod ssl",
-                require         => Exec["enable ssl module"];
-		
-		"apache2 restart":
-                path    => ['/bin', '/usr/bin','/usr/sbin/'],
-                command => "/etc/init.d/apache2 restart",
-                require         => Exec["enable ssl"];
-	}
-
-
-	# -----  port check failed for port 443 -- recheck
-	#exec {"wait_for_server-$deployment_code":
-        #    command => "/usr/bin/wget --spider --tries 100 --retry-connrefused --no-check-certificate https://$ipaddress:$serverport",
-        #    require => Exec["apache2 restart"];
-        # }
-
-
-	# Copy and configure agent packs
-        #file {  "/opt/apache-stratos-cartridge-agent/apache-stratos-event-publisher-4.0.0-SNAPSHOT-bin.zip":
-        #	source          => "puppet:///commons/apache-stratos-event-publisher-4.0.0-SNAPSHOT-bin.zip",
-        #        ensure          => present,
-	#} 	
-
-        #file {  "/opt/apache-stratos-cartridge-agent/apache-stratos-event-subscriber-4.0.0-SNAPSHOT-bin.zip":
-        #        source          => "puppet:///commons/apache-stratos-event-subscriber-4.0.0-SNAPSHOT-bin.zip",
-        #        ensure          => present,
-        #}
-
-
-        #file {  "/opt/apache-stratos-cartridge-agent/apache-stratos-health-publisher-4.0.0-SNAPSHOT-bin.zip":
-        #        source          => "puppet:///commons/apache-stratos-health-publisher-4.0.0-SNAPSHOT-bin.zip",
-        #        ensure          => present,
-        #}
-
-        file {  "/opt/apache-stratos-cartridge-agent/apache-stratos-cartridge-agent-4.0.0-SNAPSHOT-bin.zip":
-                source          => "puppet:///commons/apache-stratos-cartridge-agent-4.0.0-SNAPSHOT-bin.zip",
-                ensure          => present,
-        }
-
-        file {  "/opt/apache-stratos-cartridge-agent/cartridge-agent.sh":
-                source          => "puppet:///commons/cartridge-agent.sh",
-                ensure          => present,
-        }
-
-
-        file {  "/opt/apache-stratos-cartridge-agent/get-launch-params.rb":
-                source          => "puppet:///commons/get-launch-params.rb",
-                ensure          => present,
-        }
-
-
-        #file {  "/opt/apache-stratos-cartridge-agent/healthcheck.sh":
-        #        source          => "puppet:///commons/healthcheck.sh",
-        #        ensure          => present,
-        #}
-
-
-	file {"/tmp/puppet-payload":
-		 ensure  => present,
-		 content => ",MB_IP=${mb_ip},MB_PORT=${mb_port},CEP_IP=${cep_ip},CEP_PORT=${cep_port},CERT_TRUSTSTORE=${cert_truststore},TRUSTSTORE_PASSWORD=${truststore_password},APP_PATH=${docroot},ENABLE_DATA_PUBLISHER=${enable_data_publishing},MONITORING_SERVER_IP=${monitoring_server_ip},MONITORING_SERVER_PORT=${monitoring_server_port},MONITORING_SERVER_SECURE_PORT=${monitoring_server_secure_port},MONITORING_SERVER_ADMIN_USERNAME=${monitoring_server_admin_username},MONITORING_SERVER_ADMIN_PASSWORD=${monitoring_server_admin_password}",
-                 require => Exec["apache2 restart"];
-	}
-
-        exec {"run_agent_script-$deployment_code":
-                command => "/opt/apache-stratos-cartridge-agent/cartridge-agent.sh",
-                require => File["/tmp/puppet-payload"];
-        }
-	
-
-
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6089f8a6/tools/puppet/manifests/classes/ssh.pp
----------------------------------------------------------------------
diff --git a/tools/puppet/manifests/classes/ssh.pp b/tools/puppet/manifests/classes/ssh.pp
deleted file mode 100755
index 1154dff..0000000
--- a/tools/puppet/manifests/classes/ssh.pp
+++ /dev/null
@@ -1,61 +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 ssh ( $port=22, $bind_address, $root_login=no, $pubkey_auth=yes, $password_auth=yes, $use_pam=yes ) {
-	
-	$service      = "ssh"
-       	$template     = "sshd_config.erb"
-        $provider     = "apt"
-
-	package { "openssh-server":
-		provider	=> $provider,
-                ensure 		=> installed,
-        }
-
-        service { $service:
-                ensure    	=> running,
-                enable    	=> true,
-                subscribe 	=> File["/etc/ssh/sshd_config"],
-                require   	=> Package["openssh-server"],
-        }
-
-        file { "/etc/ssh/sshd_config":
-                ensure  	=> present,
-                content 	=> template("ssh/${template}"),
-                require 	=> Package["openssh-server"],
-                notify  	=> Service[$service];
-
-		"/etc/pam.d/sshd":
-                ensure  	=> present,
-                source  	=> "puppet:///ssh/pam/sshd",
-                require 	=> Package["openssh-server"],
-                notify  	=> Service[$service];
-	
-		"/home/ubuntu/.ssh/authorized_keys":
-		ensure 		=> present,
-		source		=> "puppet:///ssh/authorized_keys",
-		require		=> Package["openssh-server"];
-
-		"/home/kurumba/.ssh":
-		ensure		=> directory;
-        }
-}
-

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6089f8a6/tools/puppet/manifests/classes/stratos.pp
----------------------------------------------------------------------
diff --git a/tools/puppet/manifests/classes/stratos.pp b/tools/puppet/manifests/classes/stratos.pp
deleted file mode 100644
index bd70001..0000000
--- a/tools/puppet/manifests/classes/stratos.pp
+++ /dev/null
@@ -1,93 +0,0 @@
-# Parent of a startos service deployment
-
-class stratos {
-
-## Cleans the previous deployment. If the maintenance mode is set to true, this will only kill the running service.
-	
-	define clean ( $mode, $target ) {	
-
-		exec { "remove_${name}_poop":
-                	path            => "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/java/bin/",
-	                onlyif          => "test -d ${target}/repository",
-        	        command         => $mode ? {
-                	                        "true"  => "kill -9 `cat ${target}/stratos.pid` ; /bin/echo Killed",
-                        	                "false" => "kill -9 `cat ${target}/stratos.pid` ; rm -rf ${target}",
-                        	                "fresh" => "kill -9 `cat ${target}/stratos.pid` ; rm -rf ${target} ; rm -f ${local_dir}/apache-stratos-${service}-${version}.zip",
-                                	   },
-		}
-	}
-
-## Initializing the deployment by placing a customized script in /opt/bin which will download and extract the pack.
-
-	define initialize (  $version, $service, $local_dir, $target, $mode, $owner ) {
-
-		file {  "${local_dir}/apache-stratos-${service}-${version}.zip":
-			source		=> "puppet:///commons/apache-stratos-${service}-${version}.zip",
-			ensure		=> present,
-			require		=> [ Exec["creating_target_for_${name}"],
-					     Exec["creating_local_package_repo_for_${name}"] ];
-		}
-
-		exec {  "creating_target_for_${name}":
-			path    	=> ["/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"],
-			command		=> "mkdir -p ${target}";
-
-			"creating_local_package_repo_for_${name}":
-			path		=> "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/java/bin/",
-			unless		=> "test -d ${local_dir}",
-			command		=> "mkdir -p ${local_dir}";
-		
-		
-			"extracting_apache-stratos-${service}-${version}.zip_for_${name}":
-			path    	=> ["/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"],
-			cwd		=> $target,
-			unless		=> "test -d ${target}/apache-stratos-${service}-${version}/repository",
-			command 	=> "unzip ${local_dir}/apache-stratos-${service}-${version}.zip",
-			logoutput       => "on_failure",
-			creates		=> "${target}/apache-stratos-${service}-${version}/repository",
-                        timeout 	=> 0,
-                        require 	=> File["${local_dir}/apache-stratos-${service}-${version}.zip"];
-
-			"setting_permission_for_${name}":
-			path            => ["/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"],
-                        cwd             => $target,
-			command         => "chown -R ${owner}:${owner} ${target}/apache-stratos-${service}-${version} ;
-					    chmod -R 755 ${target}/apache-stratos-${service}-${version}",
-			logoutput       => "on_failure",
-			timeout         => 0,
-                        require 	=> Exec["extracting_apache-stratos-${service}-${version}.zip_for_${name}"];
-
-
-                        "update_loadbalancer_conf":
-                        path            => ["/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"],
-                        cwd             => $target,
-                        command         => "sed -i 's/mb-ip: .*;/mb-ip: $mb_ip;/g;s/mb-port: .*;/mb-port: $mb_port;/g;s/cep-ip: .*;/cep-ip: $cep_ip;/g;s/cep-port: .*;/cep-port: $cep_port;/g' ${target}/apache-stratos-${service}-${version}/repository/conf/loadbalancer.conf",
-                        logoutput       => "on_failure",
-                        timeout         => 0,
-                        require         => Exec["setting_permission_for_${name}"];
-			
-
-		}
-
-	}
-
-
-## Executes the deployment by pushing all necessary configurations and patches
-
-	define deploy ( $service, $security, $target, $owner, $group ) {
-		
-
-	}
-
-## Starts the service once the deployment is successful.
-
-	define start ( $target, $owner ) {
-		exec { "strating_${name}":
-			user		=> $owner,
-			path            => "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/java/bin/",
-			environment     => 'JAVA_HOME=/opt/java',
-	                command         => "${target}/bin/stratos.sh > /var/log/lb_start.log 2>&1 &",
-        	        creates         => "${target}/repository/wso2server.log",
-		}
-	}
-}

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6089f8a6/tools/puppet/manifests/classes/system_config.pp
----------------------------------------------------------------------
diff --git a/tools/puppet/manifests/classes/system_config.pp b/tools/puppet/manifests/classes/system_config.pp
deleted file mode 100755
index fc2c39c..0000000
--- a/tools/puppet/manifests/classes/system_config.pp
+++ /dev/null
@@ -1,77 +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 system_config {
-
-	include hosts
-	include apt
-#	include nrpe
-#	include ganglia
-        include java
-#	include mcollective
-
-#	class { "ssh":
-#                port => 1984,
-#                bind_address => $ipaddress,
-#                root_login => yes,
-#                pubkey_auth => yes,
-#                password_auth => yes,
-#                use_pam => yes,
-#        }
-	
-	user { "kurumba": 
-  		password   => "1Mmhh30pWiMz2N720hC4",
-  		ensure     => present,                            
- 	 	managehome => true,
-	}
-
-	file {  "/root/bin":
-                owner   => root,
-                group   => root,
-                ensure  => "directory";
-
-#		"/root/bin/firewall":
-#                owner   => root,
-#                group   => root,
-#                ensure  => "directory",
-#                require => File["/root/bin"];
-
-#		"/root/bin/puppet_init.sh":
-#                owner   => root,
-#                group   => root,
-#                mode    => 0755,
-#                source  => "puppet:///commons/bin/puppet_init.sh",
-#                require => File["/root/bin/firewall"];
-
-#		"/root/bin/puppet_clean.sh":
-#                owner   => root,
-#                group   => root,
-#                mode    => 0755,
-#                content => template("puppet_clean.sh.erb"),
-#                require => File["/root/bin/firewall"],
-		
-        }
-
-        Exec {  path    => "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/java/bin/"  }
-        #Exec {  path    => "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"  }
-}
-

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6089f8a6/tools/puppet/manifests/nodes.pp
----------------------------------------------------------------------
diff --git a/tools/puppet/manifests/nodes.pp b/tools/puppet/manifests/nodes.pp
deleted file mode 100755
index ef516eb..0000000
--- a/tools/puppet/manifests/nodes.pp
+++ /dev/null
@@ -1,135 +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.
-##
-## --------------------------------------------------------------
-
-stage { 'configure': require => Stage['main'] }
-stage { 'deploy': require => Stage['configure'] }
-
-node basenode {
-	$local_package_dir	= "/mnt/packs/"
-	$deploy_new_packs	= "true"
-}
-
-node confignode inherits basenode  {
-	## Service subdomains
-	$stratos_domain 	= "stratos.org"
-
-	## Server details for billing
-	$time_zone		= "GMT-8:00"
-	
-	## global configs to send in payload
-	$mb_ip                   = "54.251.211.89"
-        $mb_port                 = "5677"
-        $cep_ip                  = "54.251.211.89"
-        $cep_port                = "7615"
-        $cert_truststore         = "client-truststore.jks"
-        $truststore_password     = "wso2carbon"
-	$enable_data_publishing  = "false"
-	$monitoring_server_ip    = "xx.xx.xx.xx"
-	$monitoring_server_port  = "xxxx"
-	$monitoring_server_secure_port = "xxxx"
-	$monitoring_server_admin_username = "xxxx"
-	$monitoring_server_admin_password = "xxxx"
-}
-
-node 'puppet.novalocal' inherits confignode {
-	$server_ip 	= $ipaddress
-	
-	include system_config
-
-
-}
-
-node /[0-9]{1,12}.default.php/ inherits confignode {
-       
-	 include java
- 
-	class {"php_cartridge":
-                        syslog 		           => "syslog:local2",
-                        docroot         	   => "/var/www/www",
-                        samlalias        	   => "/var/www/simplesamlphp/www",
-                        serverport        	   => "443",
-                        mb_ip       		   => $mb_ip,
-                        mb_port       		   => $mb_port,
-                        cep_ip        		   => $cep_ip,
-                        cep_port      		   => $cep_port,
-	                cert_truststore  	   => $cert_truststore,
-                        truststore_password  	   => $truststore_password,
-			enable_data_publishing     => $enable_data_publishing,
-		        monitoring_server_ip       => $monitoring_server_ip,
-        		monitoring_server_port     => $monitoring_server_port,
-       			monitoring_server_secure_port => $monitoring_server_secure_port,
-        		monitoring_server_admin_username => $monitoring_server_admin_username,
-        		monitoring_server_admin_password => $monitoring_server_admin_password,
-        }
-}
-
-node /[0-9]{1,12}.default.lb/ inherits confignode {
-        $server_ip      = $ec2_local_ipv4
-
-	include java
-
-        class {"stratos::lb":
-                version                    => "4.0.0-SNAPSHOT",
-                offset                     => 0,
-                tribes_port                => 4100,
-                maintenance_mode           => "false",
-                owner                      => "root",
-                group                      => "root",
-                stage                      => "deploy",
-                adc_host                   => "sc.stratos.org",
-                adc_port                   => 9445,
-                cartridge_type             => "load-balancer",
-                generic                    => 1,
-                mb_ip                      => $mb_ip,
-                mb_port                    => $mb_port,
-                cep_ip                     => $cep_ip,
-                cep_port                   => $cep_port,
-                cert_truststore            => $cert_truststore,
-                truststore_password        => $truststore_password,               
-                enable_data_publishing     => $enable_data_publishing,
-                monitoring_server_ip       => $monitoring_server_ip,
-                monitoring_server_port     => $monitoring_server_port,
-                monitoring_server_secure_port => $monitoring_server_secure_port,
-                monitoring_server_admin_username => $monitoring_server_admin_username,
-                monitoring_server_admin_password => $monitoring_server_admin_password, 
-        }   
-
-}
-
-node /[0-9]{1,12}.default.mysql/ inherits confignode {
-
-        include java
-
-        class {"mysql":
-                mb_ip                      => $mb_ip,
-                mb_port                    => $mb_port,
-                cep_ip                     => $cep_ip,
-                cep_port                   => $cep_port,
-                cert_truststore            => $cert_truststore,
-                truststore_password        => $truststore_password,
-	        enable_data_publishing     => $enable_data_publishing,
-                monitoring_server_ip       => $monitoring_server_ip,
-                monitoring_server_port     => $monitoring_server_port,
-                monitoring_server_secure_port => $monitoring_server_secure_port,
-                monitoring_server_admin_username => $monitoring_server_admin_username,
-                monitoring_server_admin_password => $monitoring_server_admin_password,
-	}
-}

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6089f8a6/tools/puppet/manifests/nodes.pp.sample.multinode
----------------------------------------------------------------------
diff --git a/tools/puppet/manifests/nodes.pp.sample.multinode b/tools/puppet/manifests/nodes.pp.sample.multinode
deleted file mode 100755
index c5970be..0000000
--- a/tools/puppet/manifests/nodes.pp.sample.multinode
+++ /dev/null
@@ -1,107 +0,0 @@
-node 'base' {
-  $package_repo         = 'http://10.100.1.133'
-  $local_package_dir    = '/mnt/packs'
-
-  # Service subdomains
-  $domain               = 'stratos.com'
-  $as_subdomain         = 'autoscaler'
-  $management_subdomain = 'management'
-
-  $admin_username       = 'admin'
-  $admin_password       = 'admin123'
-
-
-  # Cloud controller
-  # ec2
-  # Change the provider_ec2 to true if using ec2
-  $ec2_identity         = 'dhsaghfdal'
-  $ec2_password         = 'dhsaghfdal'
-  $ec2_availability_zone= 'us-east-1c'
-  $ec2_security_groups  = 'default,stratos'
-  $ec2_instance_type    = 'm1.large'
-  $ec2_keypair          = 'stratos_key'
-  $provier_ec2          = false
-
-  #Openstack
-  # Change the provider_openstack to true if using openstack
-  $openstack_identity   = 'demo:admin'
-  $openstack_password   = 'admin123'
-  $openstack_identity_url='http://192.168.16.20:5000/v2.0'
-  $openstack_image_id   = 'RegionOne/3fe060b1-a219-4e44-9fe0-3ed8b5614b4f'
-  $provier_openstack    = true
-
-  $puppet_ip            = '10.0.0.1'
-  
-  #0
-  $mb_ip                = '10.0.0.2'
-  $mb_port              = '5672'
-  
-  #1
-  $cep_ip               = '10.0.0.3'
-  $cep_port             = '7611'
- 
-  #2
-  $cc_ip                = '10.0.0.4'
-  $cc_port              = '9443'
-
-  #3
-  $sc_ip                = '10.0.0.5'
-  $sc_port              = '9443'
-
-  #4
-  $as_ip                = '10.0.0.6'
-  $as_port              = '9443'
-
-  $git_hostname        = 'git.wso2.com'
-  $git_ip              = '10.0.0.7'
-
-
-  $mysql_server        = '10.0.0.8'
-  $mysql_user          = 'root'
-  $mysql_password      = 'root'
-
-  $truststore_password    = 'wso2carbon'
-  $internal_repo_user     = 'admin'
-  $internal_repo_password = 'admin'
-
-}
-
-node 'mb.stratos.com' inherits base {
-  require java
-  class {'messagebroker': }
-}
-
-node 'cep.stratos.com' inherits base {
-  require java
-  class {'cep': }
-}
-
-node 'cc.stratos.com' inherits base {
-  require java
-  class {'cc': }
-}
-
-node 'cc.stratos.com' inherits base {
-  require java
-  class {'cc': }
-}
-
-node 'manager.stratos.com' inherits base {
-  class {'manager': }
-}
-
-node 'autoscaler.stratos.com' inherits base {
-  class {'autoscaler': }
-}
-
-node /lb/ inherits base {
-  require java
-  class {'agent':}
-  class {'lb':}
-}
-
-node /haproxy/ inherits base {
-  require java
-  class {'haproxy':}
-  class {'agent':}
-}

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6089f8a6/tools/puppet/manifests/nodes.pp.sample.singlenode
----------------------------------------------------------------------
diff --git a/tools/puppet/manifests/nodes.pp.sample.singlenode b/tools/puppet/manifests/nodes.pp.sample.singlenode
deleted file mode 100755
index 6c45465..0000000
--- a/tools/puppet/manifests/nodes.pp.sample.singlenode
+++ /dev/null
@@ -1,112 +0,0 @@
-node 'base' {
-  $package_repo         = 'http://10.100.1.133'
-  $local_package_dir    = '/mnt/packs'
-
-  # Service subdomains
-  $domain               = 'stratos.com'
-  $as_subdomain         = 'autoscaler'
-  $management_subdomain = 'management'
-
-  $admin_username       = 'admin'
-  $admin_password       = 'admin123'
-
-
-  # Cloud controller
-  # ec2
-  # Change the provider_ec2 to true if using ec2
-  $ec2_identity         = 'dhsaghfdal'
-  $ec2_password         = 'dhsaghfdal'
-  $ec2_availability_zone= 'us-east-1c'
-  $ec2_security_groups  = 'default,stratos'
-  $ec2_instance_type    = 'm1.large'
-  $ec2_keypair          = 'stratos_key'
-  $provier_ec2          = false
-
-  #Openstack
-  # Change the provider_openstack to true if using openstack
-  $openstack_identity   = 'demo:admin'
-  $openstack_password   = 'admin123'
-  $openstack_identity_url='http://192.168.16.20:5000/v2.0'
-  $openstack_image_id   = 'RegionOne/3fe060b1-a219-4e44-9fe0-3ed8b5614b4f'
-  $provier_openstack    = true
-
-  $puppet_ip            = '10.100.1.133'
-  
-  #0
-  $mb_ip                = '10.100.1.133'
-  $mb_port              = '5672'
-  
-  #1
-  $cep_ip               = '10.100.1.133'
-  $cep_port             = '7612'
- 
-  #2
-  $cc_ip                = '10.100.1.133'
-  $cc_port              = '9445'
-
-  #3
-  $sc_ip                = '10.100.1.133'
-  $sc_port              = '9446'
-
-  #4
-  $as_ip                = '10.100.1.133'
-  $as_port              = '9447'
-
-  $git_hostname        = 'git.wso2.com'
-  $git_ip              = '10.100.1.133'
-
-
-  $mysql_server        = '10.100.1.133'
-  $mysql_user          = 'root'
-  $mysql_password      = 'root'
-
-  $bam_ip              = '10.100.1.133'
-  $bam_port            = '7616'
-  
-  $truststore_password    = 'wso2carbon'
-  $internal_repo_user     = 'admin'
-  $internal_repo_password = 'admin'
-
-}
-
-node 'stratos.com' inherits base {
-  require java
-  class {'messagebroker': 
-    offset             => 0,
-	  maintenance_mode   => 'norestart',
-  }
-  class {'cep':
-    offset             => 1,
-	  maintenance_mode   => 'norestart',
-  }
-  class {'cc': 
-    offset             => 2,
-	  maintenance_mode   => 'norestart',
-  }
-  class {'manager': 
-    offset             => 3,
-	  maintenance_mode   => 'norestart',
-  }
-  class {'autoscaler': 
-    offset             => 4,
-	  maintenance_mode => 'norestart',
-  }
-
-  Class['messagebroker'] ~> Class['cep']
-  Class['cep'] ~> Class['cc']
-  Class['cc'] ~> Class['autoscaler']
-  Class['cc'] ~> Class['manager']
-
-}
-
-node /lb/ inherits base {
-  require java
-  class {'agent':}
-  class {'lb': maintenance_mode   => 'norestart',}
-}
-
-node /haproxy/ inherits base {
-  require java
-  class {'haproxy':}
-  class {'agent':}
-}

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6089f8a6/tools/puppet/manifests/site.pp
----------------------------------------------------------------------
diff --git a/tools/puppet/manifests/site.pp b/tools/puppet/manifests/site.pp
deleted file mode 100755
index ff991f8..0000000
--- a/tools/puppet/manifests/site.pp
+++ /dev/null
@@ -1,23 +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.
-#
-# --------------------------------------------------------------
-
-import "nodes"
-import "classes/*"

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6089f8a6/tools/puppet/modules/agent/LICENSE
----------------------------------------------------------------------
diff --git a/tools/puppet/modules/agent/LICENSE b/tools/puppet/modules/agent/LICENSE
deleted file mode 100644
index 7f7950e..0000000
--- a/tools/puppet/modules/agent/LICENSE
+++ /dev/null
@@ -1,16 +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.

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6089f8a6/tools/puppet/modules/agent/manifests/init.pp
----------------------------------------------------------------------
diff --git a/tools/puppet/modules/agent/manifests/init.pp b/tools/puppet/modules/agent/manifests/init.pp
deleted file mode 100755
index 242d72c..0000000
--- a/tools/puppet/modules/agent/manifests/init.pp
+++ /dev/null
@@ -1,76 +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 agent(
-  $version = '4.0.0',
-  $owner   = 'root',
-  $group   = 'root',
-  $target  = '/mnt',
-  $type    = 'default',
-){
-
-  $deployment_code = 'cartridge-agent'
-  $carbon_version  = $version
-  $service_code    = 'cartridge-agent'
-  $carbon_home     = "${target}/apache-stratos-${service_code}-${carbon_version}"
-
-  tag($service_code)
-
-  $service_templates = [
-    'bin/stratos.sh',
-    'conf/templates/jndi.properties.template',
-    'extensions/artifacts-updated.sh',
-    'extensions/clean.sh',
-    'extensions/instance-activated.sh',
-    'extensions/instance-started.sh',
-    'extensions/start-servers.sh',
-    ]
-
-  agent::initialize { $deployment_code:
-    repo      => $package_repo,
-    version   => $carbon_version,
-    service   => $service_code,
-    local_dir => $local_package_dir,
-    target    => $target,
-    owner     => $owner,
-  }
-
-  exec { 'copy launch-params to carbon_home':
-    path    => '/bin/',
-    command => "mkdir -p ${carbon_home}/payload; cp /tmp/payload/launch-params ${carbon_home}/payload/launch-params",
-    require => Agent::Initialize[$deployment_code];
-  }
-
-  agent::push_templates {
-    $service_templates:
-      target    => $carbon_home,
-      require   => Agent::Initialize[$deployment_code];
-  }
-
-  agent::start { $deployment_code:
-    owner   => $owner,
-    target  => $carbon_home,
-    require => [
-      Exec['copy launch-params to carbon_home'],
-      Agent::Push_templates[$service_templates],
-    ];
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6089f8a6/tools/puppet/modules/agent/manifests/initialize.pp
----------------------------------------------------------------------
diff --git a/tools/puppet/modules/agent/manifests/initialize.pp b/tools/puppet/modules/agent/manifests/initialize.pp
deleted file mode 100755
index d6f6b37..0000000
--- a/tools/puppet/modules/agent/manifests/initialize.pp
+++ /dev/null
@@ -1,63 +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.
-#
-# --------------------------------------------------------------
-# Initializing the deployment
-
-define agent::initialize ($repo, $version, $service, $local_dir, $target, $owner,) {
-  exec {
-    "creating_target_for_${name}":
-      path    => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      command => "mkdir -p ${target}";
-
-    "creating_local_package_repo_for_${name}":
-      path    => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/java/bin/',
-      unless  => "test -d ${local_dir}",
-      command => "mkdir -p ${local_dir}";
-
-    "downloading_stratos${service}-${version}.zip_for_${name}":
-      path      => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      cwd       => $local_dir,
-      unless    => "test -f ${local_dir}/apache-stratos-${service}-${version}.zip",
-      command   => "wget -q ${repo}/apache-stratos-${service}-${version}.zip",
-      logoutput => 'on_failure',
-      creates   => "${local_dir}/apache-stratos-${service}-${version}.zip",
-      timeout   => 0,
-      require   => Exec["creating_local_package_repo_for_${name}", "creating_target_for_${name}"];
-
-    "extracting_stratos${service}-${version}.zip_for_${name}":
-      path      => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      cwd       => $target,
-      unless    => "test -d ${target}/apache-stratos-${service}-${version}/conf",
-      command   => "unzip ${local_dir}/apache-stratos-${service}-${version}.zip",
-      logoutput => 'on_failure',
-      creates   => "${target}/apache-stratos-${service}-${version}/repository",
-      timeout   => 0,
-      require   => Exec["downloading_stratos${service}-${version}.zip_for_${name}"];
-
-    "setting_permission_for_${name}":
-      path      => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      cwd       => $target,
-      command   => "chown -R ${owner}:${owner} ${target}/apache-stratos-${service}-${version} ;
-                    chmod -R 755 ${target}/apache-stratos-${service}-${version}",
-      logoutput => 'on_failure',
-      timeout   => 0,
-      require   => Exec["extracting_stratos${service}-${version}.zip_for_${name}"];
-  }
-}