You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ds...@apache.org on 2014/05/14 16:02:23 UTC

[15/15] git commit: AMBARI-5747 Remove facter-1.6.10, Ruby, Puppet dependencies from pom.xml and src (dsen)

AMBARI-5747 Remove facter-1.6.10, Ruby, Puppet dependencies from pom.xml and src (dsen)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3d1171b0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3d1171b0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3d1171b0

Branch: refs/heads/trunk
Commit: 3d1171b06ae77276ce1cb6e6553eb339840d799a
Parents: d56db54
Author: Dmitry Sen <ds...@hortonworks.com>
Authored: Wed May 14 17:00:48 2014 +0300
Committer: Dmitry Sen <ds...@hortonworks.com>
Committed: Wed May 14 17:00:50 2014 +0300

----------------------------------------------------------------------
 LICENSE.txt                                     |    7 -
 ambari-agent/conf/unix/ambari-agent.ini         |    6 -
 ambari-agent/pom.xml                            |   97 +-
 .../src/main/package/deb/control/postinst       |    3 -
 .../src/main/package/rpm/postinstall.sh         |    1 -
 .../src/main/puppet/manifestloader/site.pp      |   48 -
 .../configgenerator/manifests/configfile.pp     |   68 -
 .../modules/configgenerator/manifests/init.pp   |   23 -
 .../manifests/dashboard/service_check.pp        |   21 -
 .../modules/hdp-dashboard/manifests/init.pp     |   76 -
 .../modules/hdp-dashboard/manifests/params.pp   |   28 -
 .../templates/cluster_configuration.json.erb    |   97 --
 .../modules/hdp-flume/files/flumeSmoke.sh       |   23 -
 .../modules/hdp-flume/manifests/client.pp       |   25 -
 .../puppet/modules/hdp-flume/manifests/init.pp  |   27 -
 .../modules/hdp-flume/manifests/params.pp       |   24 -
 .../modules/hdp-flume/manifests/service.pp      |   28 -
 .../hdp-flume/templates/flume-env.sh.erb        |   24 -
 .../hdp-flume/templates/log4j.properties.erb    |   59 -
 .../modules/hdp-ganglia/files/checkGmetad.sh    |   37 -
 .../modules/hdp-ganglia/files/checkGmond.sh     |   62 -
 .../modules/hdp-ganglia/files/checkRrdcached.sh |   34 -
 .../modules/hdp-ganglia/files/gmetad.init       |   73 -
 .../modules/hdp-ganglia/files/gmetadLib.sh      |  204 ---
 .../puppet/modules/hdp-ganglia/files/gmond.init |   73 -
 .../modules/hdp-ganglia/files/gmondLib.sh       |  556 --------
 .../puppet/modules/hdp-ganglia/files/rrd.py     |  207 ---
 .../modules/hdp-ganglia/files/rrdcachedLib.sh   |   47 -
 .../modules/hdp-ganglia/files/setupGanglia.sh   |  141 --
 .../modules/hdp-ganglia/files/startGmetad.sh    |   64 -
 .../modules/hdp-ganglia/files/startGmond.sh     |   80 --
 .../modules/hdp-ganglia/files/startRrdcached.sh |   69 -
 .../modules/hdp-ganglia/files/stopGmetad.sh     |   43 -
 .../modules/hdp-ganglia/files/stopGmond.sh      |   55 -
 .../modules/hdp-ganglia/files/stopRrdcached.sh  |   41 -
 .../hdp-ganglia/files/teardownGanglia.sh        |   28 -
 .../modules/hdp-ganglia/manifests/config.pp     |   79 -
 .../manifests/config/generate_daemon.pp         |   43 -
 .../manifests/hdp-gmetad/service_check.pp       |   36 -
 .../manifests/hdp-gmond/service_check.pp        |   36 -
 .../modules/hdp-ganglia/manifests/init.pp       |   53 -
 .../modules/hdp-ganglia/manifests/monitor.pp    |  165 ---
 .../hdp-ganglia/manifests/monitor_and_server.pp |   79 -
 .../modules/hdp-ganglia/manifests/params.pp     |   35 -
 .../modules/hdp-ganglia/manifests/server.pp     |  259 ----
 .../templates/gangliaClusters.conf.erb          |   43 -
 .../hdp-ganglia/templates/gangliaEnv.sh.erb     |   24 -
 .../hdp-ganglia/templates/gangliaLib.sh.erb     |   62 -
 .../modules/hdp-hadoop/files/checkForFormat.sh  |   62 -
 .../modules/hdp-hadoop/files/checkWebUI.py      |   53 -
 .../hdp-hadoop/files/task-log4j.properties      |  132 --
 .../parser/functions/hdp_hadoop_get_mode.rb     |   65 -
 .../functions/hdp_hadoop_get_namenode_id.rb     |   47 -
 .../parser/functions/hdp_hadoop_get_owner.rb    |   51 -
 .../modules/hdp-hadoop/manifests/client.pp      |   56 -
 .../modules/hdp-hadoop/manifests/datanode.pp    |  100 --
 .../modules/hdp-hadoop/manifests/glusterfs.pp   |   36 -
 .../manifests/glusterfs_service_check.pp        |   26 -
 .../hdp-hadoop/manifests/hdfs/copyfromlocal.pp  |   84 --
 .../hdp-hadoop/manifests/hdfs/decommission.pp   |   49 -
 .../hdp-hadoop/manifests/hdfs/directory.pp      |  121 --
 .../manifests/hdfs/generate_exclude_file.pp     |   42 -
 .../hdp-hadoop/manifests/hdfs/service_check.pp  |  170 ---
 .../puppet/modules/hdp-hadoop/manifests/init.pp |  547 -------
 .../modules/hdp-hadoop/manifests/jobtracker.pp  |   96 --
 .../manifests/jobtracker/service_check.pp       |   29 -
 .../modules/hdp-hadoop/manifests/journalnode.pp |   60 -
 .../manifests/mapred/service_check.pp           |   75 -
 .../modules/hdp-hadoop/manifests/namenode.pp    |  285 ----
 .../hdp-hadoop/manifests/namenode/format.pp     |   61 -
 .../manifests/namenode/service_check.pp         |   28 -
 .../modules/hdp-hadoop/manifests/package.pp     |   44 -
 .../modules/hdp-hadoop/manifests/params.pp      |  222 ---
 .../modules/hdp-hadoop/manifests/service.pp     |  132 --
 .../manifests/slave/jobtracker-conn.pp          |   24 -
 .../hdp-hadoop/manifests/slave/master-conn.pp   |   27 -
 .../hdp-hadoop/manifests/slave/namenode-conn.pp |   27 -
 .../modules/hdp-hadoop/manifests/smoketest.pp   |   46 -
 .../modules/hdp-hadoop/manifests/snamenode.pp   |   98 --
 .../modules/hdp-hadoop/manifests/tasktracker.pp |   94 --
 .../puppet/modules/hdp-hadoop/manifests/zkfc.pp |   51 -
 .../templates/commons-logging.properties.erb    |   25 -
 .../hdp-hadoop/templates/exclude_hosts_list.erb |    3 -
 .../hdp-hadoop/templates/hadoop-env.sh.erb      |  122 --
 .../hadoop-metrics2.properties-GANGLIA.erb      |   45 -
 .../templates/hadoop-metrics2.properties.erb    |   45 -
 .../modules/hdp-hadoop/templates/hdfs.conf.erb  |   17 -
 .../hdp-hadoop/templates/health_check-v2.erb    |   91 --
 .../hdp-hadoop/templates/health_check.erb       |  118 --
 .../hdp-hadoop/templates/include_hosts_list.erb |    3 -
 .../hdp-hadoop/templates/log4j.properties.erb   |  227 ---
 .../modules/hdp-hadoop/templates/slaves.erb     |    3 -
 .../hdp-hadoop/templates/taskcontroller.cfg.erb |   20 -
 .../modules/hdp-hbase/files/hbaseSmoke.sh       |   26 -
 .../modules/hdp-hbase/files/hbaseSmokeVerify.sh |   32 -
 .../modules/hdp-hbase/manifests/client.pp       |   51 -
 .../hdp-hbase/manifests/hbase/service_check.pp  |  113 --
 .../puppet/modules/hdp-hbase/manifests/init.pp  |  155 --
 .../modules/hdp-hbase/manifests/master-conn.pp  |   24 -
 .../modules/hdp-hbase/manifests/master.pp       |   66 -
 .../modules/hdp-hbase/manifests/params.pp       |  110 --
 .../modules/hdp-hbase/manifests/regionserver.pp |   73 -
 .../modules/hdp-hbase/manifests/service.pp      |   82 --
 .../modules/hdp-hbase/manifests/zk-conn.pp      |   26 -
 ...hadoop-metrics.properties-GANGLIA-MASTER.erb |   50 -
 .../hadoop-metrics.properties-GANGLIA-RS.erb    |   50 -
 .../templates/hadoop-metrics.properties.erb     |   50 -
 ...metrics2-hbase.properties-GANGLIA-MASTER.erb |   62 -
 ...oop-metrics2-hbase.properties-GANGLIA-RS.erb |   62 -
 .../hdp-hbase/templates/hbase-env.sh.erb        |   83 --
 .../hdp-hbase/templates/hbase-smoke.sh.erb      |   26 -
 .../templates/hbase_client_jaas.conf.erb        |    5 -
 .../templates/hbase_grant_permissions.erb       |   21 -
 .../templates/hbase_master_jaas.conf.erb        |    8 -
 .../templates/hbase_regionserver_jaas.conf.erb  |    8 -
 .../hdp-hbase/templates/regionservers.erb       |    3 -
 .../puppet/modules/hdp-hcat/files/hcatSmoke.sh  |   35 -
 .../puppet/modules/hdp-hcat/files/pigSmoke.sh   |   18 -
 .../hdp-hcat/manifests/hcat/service_check.pp    |   73 -
 .../puppet/modules/hdp-hcat/manifests/init.pp   |   88 --
 .../puppet/modules/hdp-hcat/manifests/params.pp |   36 -
 .../modules/hdp-hcat/templates/hcat-env.sh.erb  |   25 -
 .../puppet/modules/hdp-hive/files/hiveSmoke.sh  |   23 -
 .../modules/hdp-hive/files/hiveserver2.sql      |   23 -
 .../modules/hdp-hive/files/hiveserver2Smoke.sh  |   31 -
 .../modules/hdp-hive/files/startHiveserver2.sh  |   22 -
 .../modules/hdp-hive/files/startMetastore.sh    |   22 -
 .../puppet/modules/hdp-hive/manifests/client.pp |   40 -
 .../hdp-hive/manifests/hive/service_check.pp    |   88 --
 .../puppet/modules/hdp-hive/manifests/init.pp   |  145 --
 .../hdp-hive/manifests/jdbc-connector.pp        |   63 -
 .../modules/hdp-hive/manifests/metastore.pp     |   61 -
 .../puppet/modules/hdp-hive/manifests/params.pp |   86 --
 .../puppet/modules/hdp-hive/manifests/server.pp |   61 -
 .../modules/hdp-hive/manifests/service.pp       |  129 --
 .../modules/hdp-hive/templates/hive-env.sh.erb  |   55 -
 .../hdp-hue/manifests/hue/service_check.pp      |   47 -
 .../puppet/modules/hdp-hue/manifests/init.pp    |   83 --
 .../puppet/modules/hdp-hue/manifests/params.pp  |  108 --
 .../puppet/modules/hdp-hue/manifests/server.pp  |   46 -
 .../puppet/modules/hdp-hue/manifests/service.pp |   76 -
 .../modules/hdp-hue/templates/hue-ini.cfg.erb   |  496 -------
 .../hdp-kerberos/lib/facter/kadm_keytab.rb      |   21 -
 .../parser/functions/kerberos_keytabs_input.rb  |   34 -
 .../hdp-kerberos/manifests/adminclient.pp       |  140 --
 .../hdp-kerberos/manifests/bigtop/init.pp       |  217 ---
 .../modules/hdp-kerberos/manifests/client.pp    |   50 -
 .../modules/hdp-kerberos/manifests/init.pp      |   25 -
 .../modules/hdp-kerberos/manifests/params.pp    |   70 -
 .../modules/hdp-kerberos/manifests/server.pp    |  116 --
 .../modules/hdp-kerberos/templates/kadm5.acl    |   21 -
 .../modules/hdp-kerberos/templates/kdc.conf     |   36 -
 .../modules/hdp-kerberos/templates/krb5.conf    |   47 -
 .../puppet/modules/hdp-kerberos/tests/init.pp   |   31 -
 .../hdp-monitor-webserver/manifests/init.pp     |  123 --
 .../modules/hdp-mysql/files/addMysqlUser.sh     |   41 -
 .../puppet/modules/hdp-mysql/manifests/init.pp  |   22 -
 .../modules/hdp-mysql/manifests/params.pp       |   28 -
 .../modules/hdp-mysql/manifests/server.pp       |  141 --
 .../hdp-nagios/files/check_aggregate.php        |  243 ----
 .../modules/hdp-nagios/files/check_cpu.pl       |  114 --
 .../hdp-nagios/files/check_datanode_storage.php |  100 --
 .../hdp-nagios/files/check_hdfs_blocks.php      |  115 --
 .../hdp-nagios/files/check_hdfs_capacity.php    |  109 --
 .../files/check_hive_metastore_status.sh        |   45 -
 .../hdp-nagios/files/check_hue_status.sh        |   31 -
 .../files/check_mapred_local_dir_used.sh        |   34 -
 .../hdp-nagios/files/check_name_dir_status.php  |   93 --
 .../hdp-nagios/files/check_namenodes_ha.sh      |   82 --
 .../files/check_nodemanager_health.sh           |   44 -
 .../hdp-nagios/files/check_oozie_status.sh      |   45 -
 .../hdp-nagios/files/check_rpcq_latency.php     |  104 --
 .../hdp-nagios/files/check_templeton_status.sh  |   45 -
 .../modules/hdp-nagios/files/check_webui.sh     |   87 --
 .../hdp-nagios/files/hdp_nagios_init.php        |   81 --
 .../parser/functions/hdp_nagios_all_hosts.rb    |   35 -
 .../hdp_nagios_compute_target_hosts.rb          |   42 -
 .../functions/hdp_nagios_members_exist.rb       |   34 -
 .../parser/functions/hdp_nagios_target_hosts.rb |   28 -
 .../puppet/modules/hdp-nagios/manifests/init.pp |   21 -
 .../manifests/nagios/service_check.pp           |   36 -
 .../modules/hdp-nagios/manifests/params.pp      |   98 --
 .../modules/hdp-nagios/manifests/server.pp      |  298 ----
 .../hdp-nagios/manifests/server/config.pp       |   86 --
 .../hdp-nagios/manifests/server/packages.pp     |  110 --
 .../modules/hdp-nagios/manifests/target.pp      |   21 -
 .../hdp-nagios/templates/contacts.cfg.erb       |   91 --
 .../templates/hadoop-commands.cfg.erb           |  114 --
 .../templates/hadoop-hostgroups.cfg.erb         |   20 -
 .../hdp-nagios/templates/hadoop-hosts.cfg.erb   |   16 -
 .../templates/hadoop-servicegroups.cfg.erb      |   80 --
 .../templates/hadoop-services.cfg.erb           |  753 ----------
 .../modules/hdp-nagios/templates/nagios.cfg.erb | 1349 ------------------
 .../hdp-nagios/templates/nagios.conf.erb        |   62 -
 .../modules/hdp-nagios/templates/nagios.erb     |  146 --
 .../hdp-nagios/templates/resource.cfg.erb       |   33 -
 .../modules/hdp-oozie/files/oozieSmoke.sh       |   93 --
 .../modules/hdp-oozie/files/oozieSmoke2.sh      |   95 --
 .../modules/hdp-oozie/files/wrap_ooziedb.sh     |   31 -
 .../modules/hdp-oozie/manifests/client.pp       |   40 -
 .../hdp-oozie/manifests/download-ext-zip.pp     |   31 -
 .../puppet/modules/hdp-oozie/manifests/init.pp  |  150 --
 .../hdp-oozie/manifests/oozie/service_check.pp  |   73 -
 .../modules/hdp-oozie/manifests/params.pp       |   65 -
 .../modules/hdp-oozie/manifests/server.pp       |   72 -
 .../modules/hdp-oozie/manifests/service.pp      |  223 ---
 .../hdp-oozie/templates/oozie-env.sh.erb        |   64 -
 .../templates/oozie-log4j.properties.erb        |   74 -
 .../puppet/modules/hdp-pig/files/pigSmoke.sh    |   18 -
 .../puppet/modules/hdp-pig/manifests/init.pp    |   76 -
 .../puppet/modules/hdp-pig/manifests/params.pp  |   24 -
 .../hdp-pig/manifests/pig/service_check.pp      |   70 -
 .../hdp-pig/templates/log4j.properties.erb      |   30 -
 .../modules/hdp-pig/templates/pig-env.sh.erb    |   17 -
 .../hdp-pig/templates/pig.properties.erb        |   55 -
 .../puppet/modules/hdp-repos/manifests/init.pp  |   21 -
 .../modules/hdp-repos/manifests/process_repo.pp |   42 -
 .../puppet/modules/hdp-repos/templates/repo.erb |   27 -
 .../puppet/modules/hdp-sqoop/manifests/init.pp  |  104 --
 .../hdp-sqoop/manifests/mysql-connector.pp      |   44 -
 .../modules/hdp-sqoop/manifests/params.pp       |   30 -
 .../hdp-sqoop/manifests/sqoop/service_check.pp  |   50 -
 .../hdp-sqoop/templates/sqoop-env.sh.erb        |   36 -
 .../hdp-templeton/files/templetonSmoke.sh       |   95 --
 .../modules/hdp-templeton/manifests/client.pp   |   40 -
 .../manifests/download-hive-tar.pp              |   46 -
 .../hdp-templeton/manifests/download-pig-tar.pp |   46 -
 .../modules/hdp-templeton/manifests/init.pp     |  103 --
 .../modules/hdp-templeton/manifests/params.pp   |   60 -
 .../modules/hdp-templeton/manifests/server.pp   |  134 --
 .../modules/hdp-templeton/manifests/service.pp  |   67 -
 .../manifests/templeton/service_check.pp        |   70 -
 .../hdp-templeton/templates/webhcat-env.sh.erb  |   44 -
 .../puppet/modules/hdp-tez/manifests/init.pp    |   24 -
 .../modules/hdp-tez/manifests/tez_client.pp     |   40 -
 .../files/validateYarnComponentStatus.py        |  165 ---
 .../modules/hdp-yarn/manifests/historyserver.pp |   48 -
 .../manifests/historyserver/service_check.pp    |   24 -
 .../puppet/modules/hdp-yarn/manifests/init.pp   |  166 ---
 .../hdp-yarn/manifests/mapred2/service_check.pp |   69 -
 .../hdp-yarn/manifests/mapreducev2_client.pp    |   43 -
 .../modules/hdp-yarn/manifests/nodemanager.pp   |   82 --
 .../modules/hdp-yarn/manifests/package.pp       |   28 -
 .../puppet/modules/hdp-yarn/manifests/params.pp |   59 -
 .../hdp-yarn/manifests/resourcemanager.pp       |   56 -
 .../manifests/resourcemanager/service_check.pp  |   24 -
 .../modules/hdp-yarn/manifests/service.pp       |  116 --
 .../modules/hdp-yarn/manifests/smoketest.pp     |   82 --
 .../hdp-yarn/manifests/yarn/service_check.pp    |   38 -
 .../modules/hdp-yarn/manifests/yarn_client.pp   |   34 -
 .../templates/container-executor.cfg.erb        |   22 -
 .../hdp-yarn/templates/mapreduce.conf.erb       |   17 -
 .../modules/hdp-yarn/templates/yarn-env.sh.erb  |  119 --
 .../modules/hdp-yarn/templates/yarn.conf.erb    |   17 -
 .../puppet/modules/hdp-zookeeper/files/zkEnv.sh |   96 --
 .../modules/hdp-zookeeper/files/zkServer.sh     |  120 --
 .../modules/hdp-zookeeper/files/zkService.sh    |   26 -
 .../modules/hdp-zookeeper/files/zkSmoke.sh      |   78 -
 .../modules/hdp-zookeeper/manifests/client.pp   |   47 -
 .../modules/hdp-zookeeper/manifests/init.pp     |  142 --
 .../modules/hdp-zookeeper/manifests/params.pp   |   45 -
 .../manifests/quorum/service_check.pp           |   61 -
 .../modules/hdp-zookeeper/manifests/service.pp  |   96 --
 .../manifests/zookeeper/service_check.pp        |   54 -
 .../templates/configuration.xsl.erb             |   24 -
 .../templates/log4j.properties.erb              |   71 -
 .../modules/hdp-zookeeper/templates/zoo.cfg.erb |   44 -
 .../templates/zookeeper-env.sh.erb              |   25 -
 .../templates/zookeeper_client_jaas.conf.erb    |    5 -
 .../templates/zookeeper_jaas.conf.erb           |    8 -
 .../modules/hdp/files/changeToSecureUid.sh      |   50 -
 .../parser/functions/hdp_args_as_array.rb       |   26 -
 .../functions/hdp_array_from_comma_list.rb      |   26 -
 .../parser/functions/hdp_calc_xmn_from_xms.rb   |   37 -
 .../functions/hdp_comma_list_from_array.rb      |   25 -
 .../lib/puppet/parser/functions/hdp_default.rb  |   50 -
 .../functions/hdp_escape_spec_characters.rb     |   28 -
 .../hdp/lib/puppet/parser/functions/hdp_fail.rb |   27 -
 .../functions/hdp_first_value_from_list.rb      |   25 -
 .../parser/functions/hdp_get_dir_from_url.rb    |   57 -
 .../hdp_get_directory_from_filepath.rb          |   31 -
 .../parser/functions/hdp_get_kinit_path.rb      |   36 -
 .../functions/hdp_get_major_stack_version.rb    |   28 -
 .../parser/functions/hdp_get_port_from_url.rb   |   44 -
 .../parser/functions/hdp_get_value_from_map.rb  |   37 -
 .../hdp/lib/puppet/parser/functions/hdp_host.rb |   28 -
 .../parser/functions/hdp_host_attribute.rb      |   49 -
 .../lib/puppet/parser/functions/hdp_is_empty.rb |   27 -
 .../lib/puppet/parser/functions/hdp_no_hosts.rb |   27 -
 .../puppet/parser/functions/hdp_option_value.rb |   32 -
 .../parser/functions/hdp_set_from_comma_list.rb |   34 -
 .../parser/functions/hdp_str_ends_with.rb       |   32 -
 .../puppet/parser/functions/hdp_template_var.rb |   38 -
 .../puppet/parser/functions/hdp_to_lowercase.rb |   48 -
 .../parser/functions/hdp_unique_id_and_date.rb  |   27 -
 .../hdp/lib/puppet/parser/functions/hdp_user.rb |   28 -
 .../puppet/modules/hdp/manifests/.directory     |   18 -
 .../puppet/modules/hdp/manifests/configfile.pp  |   98 --
 .../modules/hdp/manifests/download_keytabs.pp   |   43 -
 .../main/puppet/modules/hdp/manifests/init.pp   |  528 -------
 .../modules/hdp/manifests/java/jce/package.pp   |   62 -
 .../modules/hdp/manifests/java/package.pp       |   77 -
 .../puppet/modules/hdp/manifests/lzo/package.pp |   36 -
 .../modules/hdp/manifests/namenode-conn.pp      |   24 -
 .../puppet/modules/hdp/manifests/package.pp     |  156 --
 .../main/puppet/modules/hdp/manifests/params.pp |  794 -----------
 .../modules/hdp/manifests/snappy/package.pp     |   52 -
 .../main/puppet/modules/hdp/manifests/snmp.pp   |   53 -
 .../modules/hdp/manifests/testing_env_patch.pp  |   49 -
 .../puppet/modules/hdp/templates/snmpd.conf.erb |   48 -
 .../src/main/puppet/modules/puppetApply.sh      |   29 -
 .../src/main/puppet/modules/stdlib/CHANGELOG    |   20 -
 .../src/main/puppet/modules/stdlib/LICENSE      |  202 ---
 .../src/main/puppet/modules/stdlib/Modulefile   |   11 -
 .../main/puppet/modules/stdlib/README.markdown  |   45 -
 .../modules/stdlib/RELEASE_PROCESS.markdown     |   12 -
 .../lib/puppet/parser/functions/getvar.rb       |   23 -
 .../lib/puppet/parser/functions/has_key.rb      |   27 -
 .../lib/puppet/parser/functions/loadyaml.rb     |   20 -
 .../stdlib/lib/puppet/parser/functions/merge.rb |   28 -
 .../puppet/parser/functions/validate_bool.rb    |   39 -
 .../puppet/parser/functions/validate_hash.rb    |   37 -
 .../lib/puppet/parser/functions/validate_re.rb  |   35 -
 .../lib/puppet/provider/append_line/ruby.rb     |   15 -
 .../modules/stdlib/lib/puppet/type/anchor.rb    |   32 -
 .../stdlib/lib/puppet/type/append_line.rb       |   44 -
 .../puppet/modules/stdlib/manifests/init.pp     |   19 -
 .../puppet/modules/stdlib/manifests/stages.pp   |   43 -
 .../main/puppet/modules/stdlib/spec/spec.opts   |    6 -
 .../puppet/modules/stdlib/spec/spec_helper.rb   |   18 -
 .../unit/puppet/parser/functions/getvar_spec.rb |   53 -
 .../puppet/parser/functions/has_key_spec.rb     |   46 -
 .../unit/puppet/parser/functions/merge_spec.rb  |   54 -
 .../parser/functions/validate_bool_spec.rb      |   76 -
 .../parser/functions/validate_hash_spec.rb      |   63 -
 .../puppet/provider/append_line/ruby_spec.rb    |   30 -
 .../stdlib/spec/unit/puppet/type/anchor_spec.rb |   11 -
 .../spec/unit/puppet/type/append_line_spec.rb   |   24 -
 .../puppet/modules/stdlib/tests/append_line.pp  |    7 -
 .../main/puppet/modules/stdlib/tests/init.pp    |    1 -
 .../src/main/python/ambari_agent/ActionQueue.py |   66 +-
 .../main/python/ambari_agent/AmbariConfig.py    |    8 +-
 .../python/ambari_agent/CommandStatusDict.py    |    2 +-
 .../ambari_agent/CustomServiceOrchestrator.py   |  103 +-
 .../src/main/python/ambari_agent/Grep.py        |   13 -
 .../main/python/ambari_agent/PuppetExecutor.py  |  282 ----
 .../main/python/ambari_agent/RepoInstaller.py   |  109 --
 .../python/ambari_agent/manifestGenerator.py    |  396 -----
 .../src/main/python/ambari_agent/site.pp        |   92 --
 .../test/python/ambari_agent/TestActionQueue.py |  100 +-
 .../TestCustomServiceOrchestrator.py            |    5 +-
 .../src/test/python/ambari_agent/TestGrep.py    |    7 -
 .../ambari_agent/TestManifestGenerator.py       |  230 ---
 .../python/ambari_agent/TestPuppetExecutor.py   |  275 ----
 .../ambari_agent/TestPuppetExecutorManually.py  |   57 -
 .../python/ambari_agent/TestRepoInstaller.py    |   77 -
 .../ambari_agent/examples/ControllerTester.py   |   32 +-
 ambari-client/pom.xml                           |    1 -
 .../ambari/server/agent/ExecutionCommand.java   |    1 -
 .../ambari/server/agent/HeartbeatMonitor.java   |    1 -
 .../controller/AmbariActionExecutionHelper.java |    2 -
 .../AmbariCustomCommandExecutionHelper.java     |    3 -
 .../AmbariManagementControllerImpl.java         |    2 -
 .../server/state/CommandScriptDefinition.java   |    4 +-
 .../1.3.2/configs/default.hbasedecom.json       |    3 +-
 .../python/stacks/1.3.2/configs/default.json    |    3 +-
 .../1.3.2/configs/default.non_gmetad_host.json  |    3 +-
 .../python/stacks/1.3.2/configs/secured.json    |    3 +-
 .../1.3.2/configs/secured_no_jce_name.json      |    3 +-
 .../2.0.6/configs/default.hbasedecom.json       |    3 +-
 .../python/stacks/2.0.6/configs/default.json    |    3 +-
 .../2.0.6/configs/default.non_gmetad_host.json  |    3 +-
 .../stacks/2.0.6/configs/flume_target.json      |    3 +-
 .../python/stacks/2.0.6/configs/ha_default.json |    3 +-
 .../python/stacks/2.0.6/configs/ha_secured.json |    3 +-
 .../python/stacks/2.0.6/configs/secured.json    |    3 +-
 .../2.0.6/configs/secured_no_jce_name.json      |    3 +-
 .../test/python/stacks/2.1/configs/default.json |    3 +-
 .../test/python/stacks/2.1/configs/secured.json |    3 +-
 docs/src/site/apt/install-0.9.apt               |    4 +-
 docs/src/site/apt/install.apt                   |    4 +-
 381 files changed, 161 insertions(+), 26686 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/LICENSE.txt
----------------------------------------------------------------------
diff --git a/LICENSE.txt b/LICENSE.txt
index 795eb37..2b6abfc 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,4 +1,3 @@
-
                                  Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
@@ -209,16 +208,10 @@ notices and license terms. Your use of the source code for the these
 subcomponents is subject to the terms and conditions of the following
 licenses. 
 
-For the stdlib in puppet modules 
-
-Copyright (C) 2011 Puppet Labs Inc
-
 and some parts:
 
 Copyright (C) 2011 Krzysztof Wilczynski
 
-Puppet Labs can be contacted at: info@puppetlabs.com
-
 Licensed 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://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-agent/conf/unix/ambari-agent.ini
----------------------------------------------------------------------
diff --git a/ambari-agent/conf/unix/ambari-agent.ini b/ambari-agent/conf/unix/ambari-agent.ini
index daf15c0..ac37f16 100644
--- a/ambari-agent/conf/unix/ambari-agent.ini
+++ b/ambari-agent/conf/unix/ambari-agent.ini
@@ -27,12 +27,6 @@ ping_port=8670
 cache_dir=/var/lib/ambari-agent/cache
 tolerate_download_failures=true
 
-[puppet]
-puppetmodules=/var/lib/ambari-agent/puppet
-ruby_home=/usr/lib/ambari-agent/lib/ruby-1.8.7-p370
-puppet_home=/usr/lib/ambari-agent/lib/puppet-2.7.9
-facter_home=/usr/lib/ambari-agent/lib/facter-1.6.10
-
 [command]
 maxretries=2
 sleepBetweenRetries=1

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-agent/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-agent/pom.xml b/ambari-agent/pom.xml
index 87d3427..da88261 100644
--- a/ambari-agent/pom.xml
+++ b/ambari-agent/pom.xml
@@ -37,13 +37,10 @@
     <package.log.dir>/var/log/ambari-agent</package.log.dir>
     <package.pid.dir>/var/run/ambari-agent</package.pid.dir>
     <skipTests>false</skipTests>
-    <facter.tar>http://downloads.puppetlabs.com/facter/facter-1.6.10.tar.gz</facter.tar>
-    <puppet.tar>http://downloads.puppetlabs.com/puppet/puppet-2.7.9.tar.gz</puppet.tar>
     <agent.install.dir>/usr/lib/python2.6/site-packages/ambari_agent</agent.install.dir>
     <resmgmt.install.dir>/usr/lib/python2.6/site-packages/resource_management</resmgmt.install.dir>
     <common_functions.install.dir>/usr/lib/ambari-agent/lib/common_functions</common_functions.install.dir>
     <jinja.install.dir>/usr/lib/python2.6/site-packages/jinja2</jinja.install.dir>
-    <ruby.tar>http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.15/repos/centos6/ruby-1.8.7-p370.tar.gz</ruby.tar>
     <lib.dir>/usr/lib/ambari-agent/lib</lib.dir>
     <python.ver>python &gt;= 2.6</python.ver>
     <deb.python.ver>python (&gt;= 2.6)</deb.python.ver>
@@ -53,20 +50,6 @@
     <target.cache.dir>${project.build.directory}/cache/</target.cache.dir>
     <resource.keeper.script>${ambari.server.module}/src/main/python/ambari_server/resourceFilesKeeper.py</resource.keeper.script>
   </properties>
-  <profiles>
-    <profile>
-      <id>suse11</id>
-      <properties>
-        <ruby.tar>http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.15/repos/suse11/ruby-1.8.7-p370.tar.gz</ruby.tar>
-      </properties>
-    </profile>
-    <profile>
-      <id>centos5</id>
-      <properties>
-        <ruby.tar>http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.15/repos/centos5/ruby-1.8.7-p370.tar.gz</ruby.tar>
-      </properties>
-    </profile>
-  </profiles>
   <build>
     <plugins>
       <plugin>
@@ -131,7 +114,7 @@
                 <argument>unitTests.py</argument>
               </arguments>
               <environmentVariables>
-                <PYTHONPATH>${project.basedir}/../ambari-common/src/main/python/jinja2:${project.basedir}/../ambari-common/src/main/python/common_functions:${project.basedir}/../ambari-common/src/test/python:${project.basedir}/../ambari-common/src/main/python:${project.basedir}/src/main/python/ambari_agent:${project.basedir}/src/main/python/resource_management:${project.basedir}/src/test/python/ambari_agent:${project.basedir}/src/test/python/resource_management:${project.basedir}/src/main/python:${project.basedir}/../ambari-agent/src/main/puppet/modules/hdp-hadoop/files:$PYTHONPATH</PYTHONPATH>
+                <PYTHONPATH>${project.basedir}/../ambari-common/src/main/python/jinja2:${project.basedir}/../ambari-common/src/main/python/common_functions:${project.basedir}/../ambari-common/src/test/python:${project.basedir}/../ambari-common/src/main/python:${project.basedir}/src/main/python/ambari_agent:${project.basedir}/src/main/python/resource_management:${project.basedir}/src/test/python/ambari_agent:${project.basedir}/src/test/python/resource_management:${project.basedir}/src/main/python:${project.basedir}/../ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/files:${project.basedir}/../ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/package/files:$PYTHONPATH</PYTHONPATH>
               </environmentVariables>
               <skip>${skipTests}</skip>
             </configuration>
@@ -256,17 +239,6 @@
               </sources>
             </mapping>
             <mapping>
-              <directory>${lib.dir}</directory>
-              <filemode>755</filemode>
-              <username>root</username>
-              <groupname>root</groupname>
-              <sources>
-                <source>
-                  <location>${project.build.directory}/lib</location>
-                </source>
-              </sources>
-            </mapping>
-            <mapping>
               <directory>${jinja.install.dir}</directory>
               <sources>
                 <source>
@@ -289,17 +261,6 @@
               </sources>
             </mapping>
             <mapping>
-              <directory>/var/lib/${project.artifactId}/puppet</directory>
-              <filemode>755</filemode>
-              <username>root</username>
-              <groupname>root</groupname>
-              <sources>
-                <source>
-                  <location>src/main/puppet</location>
-                </source>
-              </sources>
-            </mapping>
-            <mapping>
               <directory>/etc/ambari-agent/conf</directory>
               <filemode>755</filemode>
               <username>root</username>
@@ -439,17 +400,6 @@
               </mapper>
             </data>
             <data>
-              <src>${project.build.directory}/lib</src>
-              <type>directory</type>
-              <mapper>
-                <type>perm</type>
-                <prefix>${lib.dir}</prefix>
-                <user>root</user>
-                <group>root</group>
-                <filemode>755</filemode>
-              </mapper>
-            </data>
-            <data>
               <src>${project.basedir}/../ambari-common/src/main/python/jinja2/jinja2</src>
               <excludes>${project.basedir}/../ambari-common/src/main/python/jinja2/jinja2/testsuite</excludes>
               <type>directory</type>
@@ -470,17 +420,6 @@
               </mapper>
             </data>
             <data>
-              <src>src/main/puppet</src>
-              <type>directory</type>
-              <mapper>
-                <type>perm</type>
-                <prefix>/var/lib/${project.artifactId}/puppet</prefix>
-                <user>root</user>
-                <group>root</group>
-                <filemode>755</filemode>
-              </mapper>
-            </data>
-            <data>
               <src>conf/unix/ambari-agent.ini</src>
               <type>file</type>
               <mapper>
@@ -600,39 +539,6 @@
         </configuration>
       </plugin>
       <plugin>
-        <groupId>com.github.goldin</groupId>
-        <artifactId>copy-maven-plugin</artifactId>
-        <version>0.2.5</version>
-        <executions>
-          <execution>
-            <id>create-archive</id>
-            <phase>package</phase>
-            <goals>
-              <goal>copy</goal>
-            </goals>
-            <configuration>
-              <resources>
-                <resource>
-                  <targetPath>${project.build.directory}/lib</targetPath>
-                  <file>${ruby.tar}</file>
-                  <unpack>true</unpack>
-                </resource>
-                <resource>
-                  <targetPath>${project.build.directory}/lib</targetPath>
-                  <file>${facter.tar}</file>
-                  <unpack>true</unpack>
-                </resource>
-                <resource>
-                  <targetPath>${project.build.directory}/lib</targetPath>
-                  <file>${puppet.tar}</file>
-                  <unpack>true</unpack>
-                </resource>
-              </resources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
         <artifactId>maven-resources-plugin</artifactId>
         <version>2.6</version>
         <executions>
@@ -694,7 +600,6 @@
             <exclude>src/test/python/ambari_agent/dummy_files/*</exclude>
             <exclude>src/test/python/ambari_agent/dummy*.txt</exclude>
             <exclude>src/main/python/ambari_agent/imports.txt</exclude>
-            <exclude>src/main/puppet/modules/stdlib/**</exclude>
             <exclude>**/*.erb</exclude>
             <exclude>**/*.json</exclude>
             <exclude>**/*.pydevproject</exclude>

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-agent/src/main/package/deb/control/postinst
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/package/deb/control/postinst b/ambari-agent/src/main/package/deb/control/postinst
index 0ddd842..69a09e8 100644
--- a/ambari-agent/src/main/package/deb/control/postinst
+++ b/ambari-agent/src/main/package/deb/control/postinst
@@ -21,9 +21,6 @@ if [ "$1" == "configure" ]; then  # Action is install
   update-rc.d ambari-agent defaults
 fi
 
-
-chmod 755 /usr/lib/ambari-agent/lib/facter-1.6.10/bin/facter /usr/lib/ambari-agent/lib/puppet-2.7.9/bin/filebucket /usr/lib/ambari-agent/lib/puppet-2.7.9/bin/pi /usr/lib/ambari-agent/lib/puppet-2.7.9/bin/puppet /usr/lib/ambari-agent/lib/puppet-2.7.9/bin/puppetdoc /usr/lib/ambari-agent/lib/puppet-2.7.9/bin/ralsh /usr/lib/ambari-agent/lib/ruby-1.8.7-p370/bin/*
-
 BAK=/etc/ambari-agent/conf/ambari-agent.ini.old
 ORIG=/etc/ambari-agent/conf/ambari-agent.ini
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-agent/src/main/package/rpm/postinstall.sh
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/package/rpm/postinstall.sh b/ambari-agent/src/main/package/rpm/postinstall.sh
index da3ba0d..536375e 100644
--- a/ambari-agent/src/main/package/rpm/postinstall.sh
+++ b/ambari-agent/src/main/package/rpm/postinstall.sh
@@ -28,7 +28,6 @@ if [ "$1" -eq 2 ]; then # Action is upgrade
   fi
 fi
 
-chmod 755 /usr/lib/ambari-agent/lib/facter-1.6.10/bin/facter /usr/lib/ambari-agent/lib/puppet-2.7.9/bin/filebucket /usr/lib/ambari-agent/lib/puppet-2.7.9/bin/pi /usr/lib/ambari-agent/lib/puppet-2.7.9/bin/puppet /usr/lib/ambari-agent/lib/puppet-2.7.9/bin/puppetdoc /usr/lib/ambari-agent/lib/puppet-2.7.9/bin/ralsh /usr/lib/ambari-agent/lib/ruby-1.8.7-p370/bin/*
 
 BAK=/etc/ambari-agent/conf/ambari-agent.ini.old
 ORIG=/etc/ambari-agent/conf/ambari-agent.ini

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-agent/src/main/puppet/manifestloader/site.pp
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/manifestloader/site.pp b/ambari-agent/src/main/puppet/manifestloader/site.pp
deleted file mode 100644
index 7a208a6..0000000
--- a/ambari-agent/src/main/puppet/manifestloader/site.pp
+++ /dev/null
@@ -1,48 +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 manifestloader () {
-    file { '/etc/puppet/agent/modules.tgz':
-      ensure => present,
-      source => "puppet:///modules/catalog/modules.tgz",  
-      mode => '0755',
-    }
-
-    exec { 'untar_modules':
-      command => "rm -rf /etc/puppet/agent/modules ; tar zxf /etc/puppet/agent/modules.tgz -C /etc/puppet/agent/ --strip-components 3",
-      path    => '/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'
-    } 
-
-    exec { 'puppet_apply':
-      command   => "sh /etc/puppet/agent/modules/puppetApply.sh",
-      timeout   => 1800,
-      path      => '/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin',
-      logoutput => "true"
-    }
-
-    File['/etc/puppet/agent/modules.tgz'] -> Exec['untar_modules'] -> Exec['puppet_apply']
-}
-
-node default {
- stage{1 :}
- class {'manifestloader': stage => 1}
-}
-

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-agent/src/main/puppet/modules/configgenerator/manifests/configfile.pp
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/configgenerator/manifests/configfile.pp b/ambari-agent/src/main/puppet/modules/configgenerator/manifests/configfile.pp
deleted file mode 100644
index 820126d..0000000
--- a/ambari-agent/src/main/puppet/modules/configgenerator/manifests/configfile.pp
+++ /dev/null
@@ -1,68 +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.
-#
-#
-
-#
-# Generates xml configs from the given key-value hash maps
-#
-# Config file format:
-#
-# <configuration>
-#   <property>
-#     <name>name1</name><value>value1</value>
-#   </property>
-#     ..
-#   <property>
-#     <name>nameN</name><value>valueN</value>
-#   </property>
-# </configuration>
-#
-# Params:
-# - configname - name of the config file (class title by default)
-# - modulespath - modules path ('/etc/puppet/modules' by default)
-# - module - module name
-# - properties - set of the key-value pairs (puppet hash) which corresponds to property name - property value pairs of config file
-#
-# Note: Set correct $modulespath in the configgenerator (or pass it as parameter)
-#
-
-define configgenerator::configfile ($modulespath='/etc/puppet/modules', $filename, $module, $configuration, $owner = "root", $group = "root", $mode = undef) {
-  $configcontent = inline_template('<!--<%=Time.now.asctime %>-->
-  <configuration>
-  <% configuration.each do |key,value| -%>
-  <property>
-    <name><%=key %></name>
-    <value><%=value %></value>
-  </property>
-  <% end -%>
-</configuration>')
- 
-
-debug("Generating config: ${modulespath}/${filename}")
-
-file {"${modulespath}/${filename}":
-  ensure  => present,
-  content => $configcontent,
-  path => "${modulespath}/${filename}",
-  owner => $owner,
-  group => $group,
-  mode => $mode
-}
-} 

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-agent/src/main/puppet/modules/configgenerator/manifests/init.pp
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/configgenerator/manifests/init.pp b/ambari-agent/src/main/puppet/modules/configgenerator/manifests/init.pp
deleted file mode 100644
index bac20c0..0000000
--- a/ambari-agent/src/main/puppet/modules/configgenerator/manifests/init.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.
-#
-#
-
-class configgenerator() {
-}

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-agent/src/main/puppet/modules/hdp-dashboard/manifests/dashboard/service_check.pp
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-dashboard/manifests/dashboard/service_check.pp b/ambari-agent/src/main/puppet/modules/hdp-dashboard/manifests/dashboard/service_check.pp
deleted file mode 100644
index ebc52e1..0000000
--- a/ambari-agent/src/main/puppet/modules/hdp-dashboard/manifests/dashboard/service_check.pp
+++ /dev/null
@@ -1,21 +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 hdp-dashboard::dashboard::service_check(){}

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-agent/src/main/puppet/modules/hdp-dashboard/manifests/init.pp
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-dashboard/manifests/init.pp b/ambari-agent/src/main/puppet/modules/hdp-dashboard/manifests/init.pp
deleted file mode 100644
index 0770252..0000000
--- a/ambari-agent/src/main/puppet/modules/hdp-dashboard/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 hdp-dashboard(
-  $service_state = $hdp::params::cluster_client_state,
-  $opts = {}
-) inherits hdp-dashboard::params
-{
-   if ($service_state == 'no_op') {
-   } elsif ($service_state == 'uninstalled') {
-    hdp::package { 'dashboard' :
-      ensure => 'uninstalled',
-      java_needed => 'false',
-      size   => 64
-    }
-    hdp::directory_recursive_create { $conf_dir :
-      service_state => $service_state,
-      force => true
-    }
-
-    Hdp::Package['dashboard'] -> Hdp::Directory_recursive_create[$conf_dir]
-
-   } elsif ($service_state in ['running','installed_and_configured','stopped']) {
-      hdp::package { 'dashboard' :
-        java_needed => 'false',
-        size => 64
-       }
-     $conf_dir =  $hdp-dashboard::params::conf_dir
-  
-     hdp::directory_recursive_create { $conf_dir :
-       service_state => $service_state,
-       force => true
-     }
- 
-     hdp-dashboard::configfile { 'cluster_configuration.json' : }
-     Hdp-Dashboard::Configfile<||>{dashboard_host => $hdp::params::host_address}
-  
-     #top level does not need anchors
-     Hdp::Package['dashboard'] -> Hdp::Directory_recursive_create[$conf_dir] -> Hdp-Dashboard::Configfile<||> 
-    } else {
-     hdp_fail("TODO not implemented yet: service_state = ${service_state}")
-   }
-}
-
-###config file helper
-define hdp-dashboard::configfile(
-  $dashboard_host = undef
-)
-{
-  
-  hdp::configfile { "${hdp-dashboard::params::conf_dir}/${name}":
-    component      => 'dashboard',
-    owner          => root,
-    group          => root,
-    dashboard_host => $dashboard_host
-  }
-}
-
-

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-agent/src/main/puppet/modules/hdp-dashboard/manifests/params.pp
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-dashboard/manifests/params.pp b/ambari-agent/src/main/puppet/modules/hdp-dashboard/manifests/params.pp
deleted file mode 100644
index b39d6b9..0000000
--- a/ambari-agent/src/main/puppet/modules/hdp-dashboard/manifests/params.pp
+++ /dev/null
@@ -1,28 +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 hdp-dashboard::params()
-{
-  
-  $conf_dir = "/usr/share/hdp/dashboard/dataServices/conf/" #cannot change since hard coded in rpm
-
-  $hdp_cluster_name = hdp_default("hadoop/cluster_configuration/hdp_cluster_name")
-  $scheduler_name = hdp_default("hadoop/cluster_configuration/scheduler_name")
-}

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-agent/src/main/puppet/modules/hdp-dashboard/templates/cluster_configuration.json.erb
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-dashboard/templates/cluster_configuration.json.erb b/ambari-agent/src/main/puppet/modules/hdp-dashboard/templates/cluster_configuration.json.erb
deleted file mode 100644
index 30a005f..0000000
--- a/ambari-agent/src/main/puppet/modules/hdp-dashboard/templates/cluster_configuration.json.erb
+++ /dev/null
@@ -1,97 +0,0 @@
-{
-  "config_version": 1,
-  "stack_version": "1.0.2",
-  "overall": {
-    "cluster_name": "<%=scope.function_hdp_template_var("hdp_cluster_name")%>",
-    "dashboard_host": "<%=scope.function_hdp_host("public_dashboard_host")%>",
-    "dashboard_port": 80,
-    "dataservices_host": "<%=scope.function_hdp_host("public_dashboard_host")%>",
-    "dataservices_port": 80,
-    "ganglia" : {
-      "web_host": "<%=scope.function_hdp_host("public_ganglia_server_host")%>",
-      "web_port": 80,
-      "web_root": "/ganglia/?t=yes",
-      "grid_name": "HDP_GRID"
-    },
-    "nagios": {
-      "nagiosserver_host": "<%=scope.function_hdp_host("public_nagios_server_host")%>",
-      "nagiosserver_port": 80,
-      "web_root": "/nagios"
-    },
-    "jmx": {
-      "timeout": 3
-    },
-    "services": {
-	  "HDFS" : [
-        {
-          "installed": true,
-          "name": "HDFS",
-          "namenode_host": "<%=scope.function_hdp_host("public_namenode_host")%>",
-          "namenode_port": 50070,
-          "snamenode_host": "<%=scope.function_hdp_host("public_snamenode_host")%>",
-          "snamenode_port": 50090,
-          "total_datanodes": "<%=h=scope.function_hdp_template_var("slave_hosts");h.kind_of?(Array) ? h.size : ''%>",
-          "ganglia_clusters": {
-            "slaves": "HDPSlaves",
-            "namenode": "HDPNameNode"
-          }
-        }
-      ],
-      "MAPREDUCE" : [
-        {
-          "installed": true,
-          "name": "MAPREDUCE",
-          "jobtracker_host": "<%=scope.function_hdp_host("public_jtnode_host")%>",
-          "jobtracker_port": 50030,
-          "total_tasktrackers": "<%=h=scope.function_hdp_template_var("slave_hosts");h.kind_of?(Array) ? h.size : ''%>",
-          "jobhistory_host": "<%=scope.function_hdp_host("public_jtnode_host")%>",
-          "jobhistory_port": 51111,
-          "ganglia_clusters": {
-            "slaves": "HDPSlaves",
-            "jobtracker": "HDPJobTracker"
-          },
-          "scheduler_type": "<%=scope.function_hdp_template_var("scheduler_name")%>"
-        }
-      ],
-      "HBASE" : [
-        {
-          "installed": <%=not scope.function_hdp_no_hosts("public_hbase_master_hosts")%>,
-          "name": "HBASE",
-          "hbasemasters_hosts": "<%=scope.function_hdp_host("public_hbase_master_hosts")%>",
-          "hbasemasters_port": 60010,
-          "total_regionservers": "<%=h=scope.function_hdp_template_var("slave_hosts");h.kind_of?(Array) ? h.size : ''%>",
-          "ganglia_clusters": {
-            "slaves": "HDPSlaves",
-            "hbasemasters": "HDPHBaseMaster"
-          }
-        }
-      ],
-      "ZOOKEEPER" : [
-        {
-          "installed": <%=not scope.function_hdp_no_hosts("public_zookeeper_hosts")%>,
-          "name": "ZOOKEEPER"
-        }
-      ],
-      "HIVE" : [
-        {
-          "installed": <%=not scope.function_hdp_no_hosts("public_hive_server_host")%>,
-          "name": "HIVE"
-        }
-      ],
-      "TEMPLETON" : [
-        {
-          "installed": <%=not scope.function_hdp_no_hosts("public_webhcat_server_host")%>,
-          "name": "TEMPLETON"
-        }
-      ],
-      "OOZIE" : [
-        {
-          "installed": <%=not scope.function_hdp_no_hosts("public_oozie_server")%>,
-          "name": "OOZIE",
-          "oozie_host": "<%=scope.function_hdp_host("public_oozie_server")%>",
-          "oozie_port": 11000
-        }
-      ]
-    }
-  }
-}

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-agent/src/main/puppet/modules/hdp-flume/files/flumeSmoke.sh
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-flume/files/flumeSmoke.sh b/ambari-agent/src/main/puppet/modules/hdp-flume/files/flumeSmoke.sh
deleted file mode 100644
index 6bc9be4..0000000
--- a/ambari-agent/src/main/puppet/modules/hdp-flume/files/flumeSmoke.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#
-
-echo "Flume Smoke Test: Passed" 

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-agent/src/main/puppet/modules/hdp-flume/manifests/client.pp
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-flume/manifests/client.pp b/ambari-agent/src/main/puppet/modules/hdp-flume/manifests/client.pp
deleted file mode 100644
index e871533..0000000
--- a/ambari-agent/src/main/puppet/modules/hdp-flume/manifests/client.pp
+++ /dev/null
@@ -1,25 +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 hdp-flume::client(
-  $service_state = $hdp::params::cluster_client_state
-) inherits hdp::params
-{
-}

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-agent/src/main/puppet/modules/hdp-flume/manifests/init.pp
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-flume/manifests/init.pp b/ambari-agent/src/main/puppet/modules/hdp-flume/manifests/init.pp
deleted file mode 100644
index 9bd3dad..0000000
--- a/ambari-agent/src/main/puppet/modules/hdp-flume/manifests/init.pp
+++ /dev/null
@@ -1,27 +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 hdp-flume(
-  $type = server,
-  $service_state = $hdp::params::cluster_service_state,
-  $opts = {}
-) inherits hdp-flume::params
-{
-}

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-agent/src/main/puppet/modules/hdp-flume/manifests/params.pp
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-flume/manifests/params.pp b/ambari-agent/src/main/puppet/modules/hdp-flume/manifests/params.pp
deleted file mode 100644
index de6a2c5..0000000
--- a/ambari-agent/src/main/puppet/modules/hdp-flume/manifests/params.pp
+++ /dev/null
@@ -1,24 +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 hdp-flume::params() inherits hdp::params
-{
-  $flume_log_dir = hdp_default("flume_log_dir","/var/log/flume")
-}

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-agent/src/main/puppet/modules/hdp-flume/manifests/service.pp
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-flume/manifests/service.pp b/ambari-agent/src/main/puppet/modules/hdp-flume/manifests/service.pp
deleted file mode 100644
index d1525eb..0000000
--- a/ambari-agent/src/main/puppet/modules/hdp-flume/manifests/service.pp
+++ /dev/null
@@ -1,28 +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 hdp-flume::service(
-  $ensure = $hdp::params::cluster_service_state
-)
-{
-}
-
-
-

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-agent/src/main/puppet/modules/hdp-flume/templates/flume-env.sh.erb
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-flume/templates/flume-env.sh.erb b/ambari-agent/src/main/puppet/modules/hdp-flume/templates/flume-env.sh.erb
deleted file mode 100644
index 8aa5ca0..0000000
--- a/ambari-agent/src/main/puppet/modules/hdp-flume/templates/flume-env.sh.erb
+++ /dev/null
@@ -1,24 +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.
-
-# Enviroment variables can be set here.
-#
-# #JAVA_HOME=/usr/lib/jvm/java-6-sun
-#
-# # Give Flume more memory and pre-allocate, enable remote monitoring via JMX
-JAVA_OPTS="-Xms100m -Xmx200m -Dcom.sun.management.jmxremote -Dflume.monitoring.type=ganglia -Dflume.monitoring.hosts=<%=scope.function_hdp_template_var("::hdp-flume::params::ganglia_sink")%>"
-#
-# # Note that the Flume conf directory is always included in the classpath.
-# #FLUME_CLASSPATH=""

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-agent/src/main/puppet/modules/hdp-flume/templates/log4j.properties.erb
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-flume/templates/log4j.properties.erb b/ambari-agent/src/main/puppet/modules/hdp-flume/templates/log4j.properties.erb
deleted file mode 100644
index 5fec845..0000000
--- a/ambari-agent/src/main/puppet/modules/hdp-flume/templates/log4j.properties.erb
+++ /dev/null
@@ -1,59 +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.
-#
-
-# Define some default values that can be overridden by system properties.
-#
-# For testing, it may also be convenient to specify
-# -Dflume.root.logger=DEBUG,console when launching flume.
-
-#flume.root.logger=DEBUG,console
-flume.root.logger=INFO,LOGFILE
-flume.log.dir=<%=scope.function_hdp_template_var("::hdp-flume::params::flume_log_dir")%>
-flume.log.file=flume.log
-
-log4j.logger.org.apache.flume.lifecycle = INFO
-log4j.logger.org.jboss = WARN
-log4j.logger.org.mortbay = INFO
-log4j.logger.org.apache.avro.ipc.NettyTransceiver = WARN
-log4j.logger.org.apache.hadoop = INFO
-
-# Define the root logger to the system property "flume.root.logger".
-log4j.rootLogger=${flume.root.logger}
-
-#
-# Rolling file appender
-# Default log rotation configuration
-#
-
-log4j.appender.LOGFILE=org.apache.log4j.RollingFileAppender
-log4j.appender.LOGFILE.MaxFileSize=100MB
-log4j.appender.LOGFILE.MaxBackupIndex=10
-log4j.appender.LOGFILE.File=${flume.log.dir}/${flume.log.file}
-log4j.appender.LOGFILE.layout=org.apache.log4j.PatternLayout
-log4j.appender.LOGFILE.layout.ConversionPattern=%d{dd MMM yyyy HH:mm:ss,SSS} %-5p [%t] (%C.%M:%L) %x - %m%n
-
-#
-# console
-# Add "console" to rootlogger above if you want to use this
-#
-
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.target=System.err
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern=%d (%t) [%p - %l] %m%n

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/checkGmetad.sh
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/checkGmetad.sh b/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/checkGmetad.sh
deleted file mode 100644
index e60eb31..0000000
--- a/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/checkGmetad.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-#/*
-# * Licensed to the Apache Software Foundation (ASF) under one
-# * or more contributor license agreements.  See the NOTICE file
-# * distributed with this work for additional information
-# * regarding copyright ownership.  The ASF licenses this file
-# * to you under the Apache License, Version 2.0 (the
-# * "License"); you may not use this file except in compliance
-# * with the License.  You may obtain a copy of the License at
-# *
-# *     http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-# */
-
-cd `dirname ${0}`;
-
-# Get all our common constants etc. set up.
-source ./gmetadLib.sh;
-
-# Before checking gmetad, check rrdcached.
-./checkRrdcached.sh;
-
-gmetadRunningPid=`getGmetadRunningPid`;
-
-if [ -n "${gmetadRunningPid}" ]
-then
-  echo "${GMETAD_BIN} running with PID ${gmetadRunningPid}";
-else
-  echo "Failed to find running ${GMETAD_BIN}";
-  exit 1;
-fi

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/checkGmond.sh
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/checkGmond.sh b/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/checkGmond.sh
deleted file mode 100644
index 0cec8dc..0000000
--- a/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/checkGmond.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/sh
-
-#/*
-# * Licensed to the Apache Software Foundation (ASF) under one
-# * or more contributor license agreements.  See the NOTICE file
-# * distributed with this work for additional information
-# * regarding copyright ownership.  The ASF licenses this file
-# * to you under the Apache License, Version 2.0 (the
-# * "License"); you may not use this file except in compliance
-# * with the License.  You may obtain a copy of the License at
-# *
-# *     http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-# */
-
-cd `dirname ${0}`;
-
-# Get all our common constants etc. set up.
-# Pulls in gangliaLib.sh as well, so we can skip pulling it in again.
-source ./gmondLib.sh;
-
-function checkGmondForCluster()
-{
-    gmondClusterName=${1};
-
-    gmondCoreConfFileName=`getGmondCoreConfFileName ${gmondClusterName}`;
-
-    # Skip over (purported) Clusters that don't have their core conf file present.
-    if [ -e "${gmondCoreConfFileName}" ]
-    then 
-      gmondRunningPid=`getGmondRunningPid ${gmondClusterName}`;
-
-      if [ -n "${gmondRunningPid}" ]
-      then
-        echo "${GMOND_BIN} for cluster ${gmondClusterName} running with PID ${gmondRunningPid}";
-      else
-        echo "Failed to find running ${GMOND_BIN} for cluster ${gmondClusterName}";
-        exit 1;
-      fi
-    fi
-}
-
-# main()
-gmondClusterName=${1};
-
-if [ "x" == "x${gmondClusterName}" ]
-then
-    # No ${gmondClusterName} passed in as command-line arg, so check
-    # all the gmonds we know about.
-    for gmondClusterName in `getConfiguredGangliaClusterNames`
-    do
-        checkGmondForCluster ${gmondClusterName};
-    done
-else
-    # Just check the one ${gmondClusterName} that was asked for.
-    checkGmondForCluster ${gmondClusterName};
-fi

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/checkRrdcached.sh
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/checkRrdcached.sh b/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/checkRrdcached.sh
deleted file mode 100644
index d94db5d..0000000
--- a/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/checkRrdcached.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-
-#/*
-# * Licensed to the Apache Software Foundation (ASF) under one
-# * or more contributor license agreements.  See the NOTICE file
-# * distributed with this work for additional information
-# * regarding copyright ownership.  The ASF licenses this file
-# * to you under the Apache License, Version 2.0 (the
-# * "License"); you may not use this file except in compliance
-# * with the License.  You may obtain a copy of the License at
-# *
-# *     http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-# */
-
-cd `dirname ${0}`;
-
-# Get all our common constants etc. set up.
-source ./rrdcachedLib.sh;
-
-rrdcachedRunningPid=`getRrdcachedRunningPid`;
-
-if [ -n "${rrdcachedRunningPid}" ]
-then
-  echo "${RRDCACHED_BIN} running with PID ${rrdcachedRunningPid}";
-else
-  echo "Failed to find running ${RRDCACHED_BIN}";
-  exit 1;
-fi

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/gmetad.init
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/gmetad.init b/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/gmetad.init
deleted file mode 100644
index 20b388e..0000000
--- a/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/gmetad.init
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/sh
-# chkconfig: 2345 70 40
-# description: hdp-gmetad startup script
-# processname: hdp-gmetad
-#/*
-# * 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.
-# */
-
-# Remember to keep this in-sync with the definition of 
-# GANGLIA_RUNTIME_COMPONENTS_UNPACK_DIR in monrpmInstaller.sh.
-HDP_GANGLIA_RUNTIME_COMPONENTS_DIR=/usr/libexec/hdp/ganglia
-HDP_GANLIA_GMETAD_STARTER=${HDP_GANGLIA_RUNTIME_COMPONENTS_DIR}/startGmetad.sh
-HDP_GANLIA_GMETAD_STOPPER=${HDP_GANGLIA_RUNTIME_COMPONENTS_DIR}/stopGmetad.sh
-HDP_GANLIA_GMETAD_CHECKER=${HDP_GANGLIA_RUNTIME_COMPONENTS_DIR}/checkGmetad.sh
-
-RETVAL=0
-
-case "$1" in
-   start)
-      echo "============================="
-      echo "Starting hdp-gmetad..."
-      echo "============================="
-      [ -f ${HDP_GANLIA_GMETAD_STARTER} ] || exit 1
-      eval "${HDP_GANLIA_GMETAD_STARTER}"
-      RETVAL=$?
-      echo
-      [ $RETVAL -eq 0 ] && touch /var/lock/subsys/hdp-gmetad
-      ;;
-
-  stop)
-      echo "=================================="
-      echo "Shutting down hdp-gmetad..."
-      echo "=================================="
-      [ -f ${HDP_GANLIA_GMETAD_STOPPER} ] || exit 1
-      eval "${HDP_GANLIA_GMETAD_STOPPER}"
-      RETVAL=$?
-      echo
-      [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/hdp-gmetad
-      ;;
-
-  restart|reload)
-   	$0 stop
-   	$0 start
-   	RETVAL=$?
-	;;
-  status)
-      echo "======================================="
-      echo "Checking status of hdp-gmetad..."
-      echo "======================================="
-      [ -f ${HDP_GANLIA_GMETAD_CHECKER} ] || exit 1
-      eval "${HDP_GANLIA_GMETAD_CHECKER}"
-      RETVAL=$?
-      ;;
-  *)
-	echo "Usage: $0 {start|stop|restart|status}"
-	exit 1
-esac
-
-exit $RETVAL

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/gmetadLib.sh
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/gmetadLib.sh b/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/gmetadLib.sh
deleted file mode 100644
index e28610e..0000000
--- a/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/gmetadLib.sh
+++ /dev/null
@@ -1,204 +0,0 @@
-#!/bin/sh
-
-#/*
-# * Licensed to the Apache Software Foundation (ASF) under one
-# * or more contributor license agreements.  See the NOTICE file
-# * distributed with this work for additional information
-# * regarding copyright ownership.  The ASF licenses this file
-# * to you under the Apache License, Version 2.0 (the
-# * "License"); you may not use this file except in compliance
-# * with the License.  You may obtain a copy of the License at
-# *
-# *     http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-# */
-
-cd `dirname ${0}`;
-
-# Slurp in all our user-customizable settings.
-source ./gangliaEnv.sh;
-
-# Get access to Ganglia-wide constants etc.
-source ./gangliaLib.sh;
-
-GMETAD_BIN=/usr/sbin/gmetad;
-GMETAD_CONF_FILE=${GANGLIA_CONF_DIR}/gmetad.conf;
-GMETAD_PID_FILE=${GANGLIA_RUNTIME_DIR}/gmetad.pid;
-
-function getGmetadLoggedPid()
-{
-    if [ -e "${GMETAD_PID_FILE}" ]
-    then
-        echo `cat ${GMETAD_PID_FILE}`;
-    fi
-}
-
-function getGmetadRunningPid()
-{
-    gmetadLoggedPid=`getGmetadLoggedPid`;
-
-    if [ -n "${gmetadLoggedPid}" ]
-    then
-        echo `ps -o pid=MYPID -p ${gmetadLoggedPid} | tail -1 | awk '{print $1}' | grep -v MYPID`;
-    fi
-}
-
-function generateGmetadConf()
-{
-    now=`date`;
-
-    cat <<END_OF_GMETAD_CONF_1
-#################### Generated by ${0} on ${now} ####################
-#
-#-------------------------------------------------------------------------------
-# Setting the debug_level to 1 will keep daemon in the forground and
-# show only error messages. Setting this value higher than 1 will make 
-# gmetad output debugging information and stay in the foreground.
-# default: 0
-# debug_level 10
-#
-#-------------------------------------------------------------------------------
-# What to monitor. The most important section of this file. 
-#
-# The data_source tag specifies either a cluster or a grid to
-# monitor. If we detect the source is a cluster, we will maintain a complete
-# set of RRD databases for it, which can be used to create historical 
-# graphs of the metrics. If the source is a grid (it comes from another gmetad),
-# we will only maintain summary RRDs for it.
-#
-# Format: 
-# data_source "my cluster" [polling interval] address1:port addreses2:port ...
-# 
-# The keyword 'data_source' must immediately be followed by a unique
-# string which identifies the source, then an optional polling interval in 
-# seconds. The source will be polled at this interval on average. 
-# If the polling interval is omitted, 15sec is asssumed. 
-#
-# If you choose to set the polling interval to something other than the default,
-# note that the web frontend determines a host as down if its TN value is less
-# than 4 * TMAX (20sec by default).  Therefore, if you set the polling interval
-# to something around or greater than 80sec, this will cause the frontend to
-# incorrectly display hosts as down even though they are not.
-#
-# A list of machines which service the data source follows, in the 
-# format ip:port, or name:port. If a port is not specified then 8649
-# (the default gmond port) is assumed.
-# default: There is no default value
-#
-# data_source "my cluster" 10 localhost  my.machine.edu:8649  1.2.3.5:8655
-# data_source "my grid" 50 1.3.4.7:8655 grid.org:8651 grid-backup.org:8651
-# data_source "another source" 1.3.4.7:8655  1.3.4.8
-END_OF_GMETAD_CONF_1
-
-    # Get info about all the configured Ganglia clusters.
-    getGangliaClusterInfo | while read gangliaClusterInfoLine
-    do
-        # From each, parse out ${gmondClusterName}, ${gmondMasterIP} and ${gmondPort}... 
-        read gmondClusterName gmondMasterIP gmondPort <<<`echo ${gangliaClusterInfoLine}`;
-        # ...and generate a corresponding data_source line for gmetad.conf. 
-        echo "data_source \"${gmondClusterName}\" ${gmondMasterIP}:${gmondPort}";
-    done
-
-    cat <<END_OF_GMETAD_CONF_2
-#
-# Round-Robin Archives
-# You can specify custom Round-Robin archives here (defaults are listed below)
-#
-# Old Default RRA: Keep 1 hour of metrics at 15 second resolution. 1 day at 6 minute
-# RRAs "RRA:AVERAGE:0.5:1:244" "RRA:AVERAGE:0.5:24:244" "RRA:AVERAGE:0.5:168:244" "RRA:AVERAGE:0.5:672:244" \
-#      "RRA:AVERAGE:0.5:5760:374"
-# New Default RRA
-# Keep 5856 data points at 15 second resolution assuming 15 second (default) polling. That's 1 day
-# Two weeks of data points at 1 minute resolution (average)
-#RRAs "RRA:AVERAGE:0.5:1:5856" "RRA:AVERAGE:0.5:4:20160" "RRA:AVERAGE:0.5:40:52704"
-# Retaining existing resolution
-RRAs "RRA:AVERAGE:0.5:1:244" "RRA:AVERAGE:0.5:24:244" "RRA:AVERAGE:0.5:168:244" "RRA:AVERAGE:0.5:672:244" \
-     "RRA:AVERAGE:0.5:5760:374"
-#
-#-------------------------------------------------------------------------------
-# Scalability mode. If on, we summarize over downstream grids, and respect
-# authority tags. If off, we take on 2.5.0-era behavior: we do not wrap our output
-# in <GRID></GRID> tags, we ignore all <GRID> tags we see, and always assume
-# we are the "authority" on data source feeds. This approach does not scale to
-# large groups of clusters, but is provided for backwards compatibility.
-# default: on
-# scalable off
-#
-#-------------------------------------------------------------------------------
-# The name of this Grid. All the data sources above will be wrapped in a GRID
-# tag with this name.
-# default: unspecified
-gridname "HDP_GRID"
-#
-#-------------------------------------------------------------------------------
-# The authority URL for this grid. Used by other gmetads to locate graphs
-# for our data sources. Generally points to a ganglia/
-# website on this machine.
-# default: "http://hostname/ganglia/",
-#   where hostname is the name of this machine, as defined by gethostname().
-# authority "http://mycluster.org/newprefix/"
-#
-#-------------------------------------------------------------------------------
-# List of machines this gmetad will share XML with. Localhost
-# is always trusted. 
-# default: There is no default value
-# trusted_hosts 127.0.0.1 169.229.50.165 my.gmetad.org
-#
-#-------------------------------------------------------------------------------
-# If you want any host which connects to the gmetad XML to receive
-# data, then set this value to "on"
-# default: off
-# all_trusted on
-#
-#-------------------------------------------------------------------------------
-# If you don't want gmetad to setuid then set this to off
-# default: on
-# setuid off
-#
-#-------------------------------------------------------------------------------
-# User gmetad will setuid to (defaults to "nobody")
-# default: "nobody"
-setuid_username "${GMETAD_USER}"
-#
-#-------------------------------------------------------------------------------
-# Umask to apply to created rrd files and grid directory structure
-# default: 0 (files are public)
-# umask 022
-#
-#-------------------------------------------------------------------------------
-# The port gmetad will answer requests for XML
-# default: 8651
-# xml_port 8651
-#
-#-------------------------------------------------------------------------------
-# The port gmetad will answer queries for XML. This facility allows
-# simple subtree and summation views of the XML tree.
-# default: 8652
-# interactive_port 8652
-#
-#-------------------------------------------------------------------------------
-# The number of threads answering XML requests
-# default: 4
-# server_threads 10
-#
-#-------------------------------------------------------------------------------
-# Where gmetad stores its round-robin databases
-# default: "/var/lib/ganglia/rrds"
-# rrd_rootdir "/some/other/place"
-#
-#-------------------------------------------------------------------------------
-# In earlier versions of gmetad, hostnames were handled in a case
-# sensitive manner
-# If your hostname directories have been renamed to lower case,
-# set this option to 0 to disable backward compatibility.
-# From version 3.2, backwards compatibility will be disabled by default.
-# default: 1   (for gmetad < 3.2)
-# default: 0   (for gmetad >= 3.2)
-case_sensitive_hostnames 1
-END_OF_GMETAD_CONF_2
-}

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/gmond.init
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/gmond.init b/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/gmond.init
deleted file mode 100644
index afb7026..0000000
--- a/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/gmond.init
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/sh
-# chkconfig: 2345 70 40
-# description: hdp-gmond startup script
-# processname: hdp-gmond
-#/*
-# * 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.
-# */
-
-# Remember to keep this in-sync with the definition of 
-# GANGLIA_RUNTIME_COMPONENTS_UNPACK_DIR in monrpmInstaller.sh.
-HDP_GANGLIA_RUNTIME_COMPONENTS_DIR=/usr/libexec/hdp/ganglia
-HDP_GANLIA_GMOND_STARTER=${HDP_GANGLIA_RUNTIME_COMPONENTS_DIR}/startGmond.sh
-HDP_GANLIA_GMOND_STOPPER=${HDP_GANGLIA_RUNTIME_COMPONENTS_DIR}/stopGmond.sh
-HDP_GANLIA_GMOND_CHECKER=${HDP_GANGLIA_RUNTIME_COMPONENTS_DIR}/checkGmond.sh
-
-RETVAL=0
-
-case "$1" in
-   start)
-      echo "============================="
-      echo "Starting hdp-gmond..."
-      echo "============================="
-      [ -f ${HDP_GANLIA_GMOND_STARTER} ] || exit 1
-      eval "${HDP_GANLIA_GMOND_STARTER}"
-      RETVAL=$?
-      echo
-      [ $RETVAL -eq 0 ] && touch /var/lock/subsys/hdp-gmond
-      ;;
-
-  stop)
-      echo "=================================="
-      echo "Shutting down hdp-gmond..."
-      echo "=================================="
-      [ -f ${HDP_GANLIA_GMOND_STOPPER} ] || exit 1
-      eval "${HDP_GANLIA_GMOND_STOPPER}"
-      RETVAL=$?
-      echo
-      [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/hdp-gmond
-      ;;
-
-  restart|reload)
-   	$0 stop
-   	$0 start
-   	RETVAL=$?
-	;;
-  status)
-      echo "======================================="
-      echo "Checking status of hdp-gmond..."
-      echo "======================================="
-      [ -f ${HDP_GANLIA_GMOND_CHECKER} ] || exit 1
-      eval "${HDP_GANLIA_GMOND_CHECKER}"
-      RETVAL=$?
-      ;;
-  *)
-	echo "Usage: $0 {start|stop|restart|status}"
-	exit 1
-esac
-
-exit $RETVAL