incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From maha...@apache.org
Subject svn commit: r1398196 [1/11] - in /incubator/ambari/branches/branch-0.9-h2-dev: ./ hmc/js/ hmc/package/rpm/ hmc/php/conf/ hmc/php/db/ hmc/php/frontend/ hmc/php/orchestrator/ hmc/php/puppet/ hmc/php/puppet/genmanifest/ hmc/php/util/ hmc/puppet/modules/hd...
Date Mon, 15 Oct 2012 05:55:57 GMT
Author: mahadev
Date: Mon Oct 15 05:55:46 2012
New Revision: 1398196

URL: http://svn.apache.org/viewvc?rev=1398196&view=rev
Log:
AMBARI-861. Support for Hadoop 2.0 includes puppet script changes.

Added:
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-ganglia/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-ganglia/files/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-ganglia/files/checkGmetad.sh
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-ganglia/files/checkGmond.sh
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-ganglia/files/checkRrdcached.sh
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-ganglia/files/gmetad.init
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-ganglia/files/gmetadLib.sh
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-ganglia/files/gmond.init
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-ganglia/files/gmondLib.sh
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-ganglia/files/rrdcachedLib.sh
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-ganglia/files/setupGanglia.sh
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-ganglia/files/startGmetad.sh
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-ganglia/files/startGmond.sh
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-ganglia/files/startRrdcached.sh
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-ganglia/files/stopGmetad.sh
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-ganglia/files/stopGmond.sh
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-ganglia/files/stopRrdcached.sh
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-ganglia/files/teardownGanglia.sh
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-ganglia/manifests/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-ganglia/manifests/config/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-ganglia/manifests/config.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-ganglia/manifests/config/generate_monitor.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-ganglia/manifests/config/generate_server.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-ganglia/manifests/hdp-gmetad/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-ganglia/manifests/hdp-gmetad/service_check.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-ganglia/manifests/hdp-gmond/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-ganglia/manifests/hdp-gmond/service_check.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-ganglia/manifests/init.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-ganglia/manifests/monitor.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-ganglia/manifests/monitor_and_server.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-ganglia/manifests/params.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-ganglia/manifests/server.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-ganglia/templates/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-ganglia/templates/gangliaClusters.conf.erb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-ganglia/templates/gangliaEnv.sh.erb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-ganglia/templates/gangliaLib.sh.erb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hadoop/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hadoop/files/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hadoop/files/checkForFormat.sh
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hadoop/manifests/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hadoop/manifests/.directory
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hadoop/manifests/client.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hadoop/manifests/datanode.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hadoop/manifests/hdfs/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hadoop/manifests/hdfs/copyfromlocal.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hadoop/manifests/hdfs/directory.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hadoop/manifests/hdfs/service_check.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hadoop/manifests/init.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hadoop/manifests/mapred/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hadoop/manifests/mapred/service_check.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hadoop/manifests/namenode/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hadoop/manifests/namenode.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hadoop/manifests/namenode/format.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hadoop/manifests/namenode/service_check.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hadoop/manifests/nodemanager.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hadoop/manifests/package.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hadoop/manifests/params.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hadoop/manifests/resourcemanager/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hadoop/manifests/resourcemanager.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hadoop/manifests/resourcemanager/service_check.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hadoop/manifests/service.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hadoop/manifests/slave/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hadoop/manifests/slave/master-conn.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hadoop/manifests/slave/namenode-conn.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hadoop/manifests/slave/resourcemanager-conn.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hadoop/manifests/smoketest.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hadoop/manifests/snamenode.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hadoop/templates/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hadoop/templates/capacity-scheduler.xml.erb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hadoop/templates/commons-logging.properties.erb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hadoop/templates/container-executor.cfg.erb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hadoop/templates/core-site.xml.erb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hadoop/templates/hadoop-env.sh.erb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hadoop/templates/hadoop-metrics2.properties-GANGLIA.erb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hadoop/templates/hadoop-metrics2.properties.erb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hadoop/templates/hadoop-policy.xml.erb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hadoop/templates/hdfs-site.xml.erb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hadoop/templates/health_check.erb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hadoop/templates/log4j.properties.erb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hadoop/templates/mapred-site.xml.erb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hadoop/templates/slaves.erb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hadoop/templates/yarn-env.sh.erb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hadoop/templates/yarn-site.xml.erb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hbase/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hbase/files/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hbase/files/hbaseSmoke.sh
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hbase/manifests/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hbase/manifests/client.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hbase/manifests/hbase/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hbase/manifests/hbase/service_check.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hbase/manifests/init.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hbase/manifests/master-conn.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hbase/manifests/master.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hbase/manifests/params.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hbase/manifests/regionserver.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hbase/manifests/service.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hbase/manifests/zk-conn.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hbase/templates/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hbase/templates/hadoop-metrics.properties-GANGLIA-MASTER.erb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hbase/templates/hadoop-metrics.properties-GANGLIA-RS.erb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hbase/templates/hadoop-metrics.properties.erb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hbase/templates/hbase-env.sh.erb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hbase/templates/hbase-policy.xml.erb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hbase/templates/hbase-site.xml.erb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hbase/templates/log4j.properties.erb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hbase/templates/regionservers.erb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hcat/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hcat/files/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hcat/files/hcatSmoke.sh
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hcat/files/pigSmoke.sh
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hcat/manifests/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hcat/manifests/hcat/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hcat/manifests/hcat/service_check.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hcat/manifests/init.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hcat/manifests/params.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hcat/templates/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hcat/templates/hcat-env.sh.erb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hive/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hive/files/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hive/files/hiveSmoke.sh
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hive/manifests/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hive/manifests/client.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hive/manifests/hive/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hive/manifests/hive/service_check.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hive/manifests/init.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hive/manifests/mysql-connector.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hive/manifests/params.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hive/manifests/server.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hive/manifests/service.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hive/templates/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hive/templates/hive-env.sh.erb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-hive/templates/hive-site.xml.erb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-mysql/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-mysql/files/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-mysql/files/startMysql.sh
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-mysql/manifests/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-mysql/manifests/init.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-mysql/manifests/params.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-mysql/manifests/server.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-nagios/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-nagios/files/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-nagios/files/check_aggregate.php
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-nagios/files/check_cpu.pl
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-nagios/files/check_datanode_storage.php
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-nagios/files/check_hdfs_blocks.php
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-nagios/files/check_hdfs_capacity.php
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-nagios/files/check_hive_metastore_status.sh
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-nagios/files/check_name_dir_status.php
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-nagios/files/check_oozie_status.sh
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-nagios/files/check_puppet_agent_status.php
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-nagios/files/check_rpcq_latency.php
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-nagios/files/check_templeton_status.sh
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-nagios/files/check_webui.sh
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-nagios/lib/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-nagios/lib/puppet/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-nagios/lib/puppet/parser/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-nagios/lib/puppet/parser/functions/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-nagios/lib/puppet/parser/functions/hdp_nagios_all_hosts.rb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-nagios/lib/puppet/parser/functions/hdp_nagios_compute_target_hosts.rb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-nagios/lib/puppet/parser/functions/hdp_nagios_members_exist.rb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-nagios/lib/puppet/parser/functions/hdp_nagios_target_hosts.rb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-nagios/manifests/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-nagios/manifests/init.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-nagios/manifests/nagios/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-nagios/manifests/nagios/service_check.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-nagios/manifests/params.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-nagios/manifests/server/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-nagios/manifests/server.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-nagios/manifests/server/config.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-nagios/manifests/server/packages.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-nagios/manifests/target.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-nagios/templates/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-nagios/templates/contacts.cfg.erb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-nagios/templates/hadoop-commands.cfg.erb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-nagios/templates/hadoop-hostgroups.cfg.erb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-nagios/templates/hadoop-hosts.cfg.erb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-nagios/templates/hadoop-servicegroups.cfg.erb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-nagios/templates/hadoop-services.cfg.erb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-nagios/templates/nagios.cfg.erb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-oozie/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-oozie/files/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-oozie/files/oozieSmoke.sh
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-oozie/manifests/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-oozie/manifests/client.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-oozie/manifests/download-ext-zip.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-oozie/manifests/init.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-oozie/manifests/oozie/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-oozie/manifests/oozie/service_check.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-oozie/manifests/params.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-oozie/manifests/server.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-oozie/manifests/service.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-oozie/templates/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-oozie/templates/oozie-env.sh.erb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-oozie/templates/oozie-log4j.properties.erb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-oozie/templates/oozie-site.xml.erb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-pig/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-pig/files/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-pig/files/pigSmoke.sh
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-pig/manifests/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-pig/manifests/init.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-pig/manifests/params.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-pig/manifests/pig/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-pig/manifests/pig/service_check.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-pig/templates/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-pig/templates/log4j.properties.erb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-pig/templates/pig-env.sh.erb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-pig/templates/pig.properties.erb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-zookeeper/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-zookeeper/files/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-zookeeper/files/zkEnv.sh
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-zookeeper/files/zkServer.sh
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-zookeeper/files/zkService.sh
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-zookeeper/files/zkSmoke.sh
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-zookeeper/manifests/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-zookeeper/manifests/client.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-zookeeper/manifests/init.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-zookeeper/manifests/params.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-zookeeper/manifests/quorum/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-zookeeper/manifests/quorum/service_check.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-zookeeper/manifests/service.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-zookeeper/manifests/zookeeper/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-zookeeper/manifests/zookeeper/service_check.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-zookeeper/templates/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-zookeeper/templates/configuration.xsl.erb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-zookeeper/templates/log4j.properties.erb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-zookeeper/templates/zoo.cfg.erb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2-zookeeper/templates/zookeeper-env.sh.erb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/lib/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/lib/puppet/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/lib/puppet/parser/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/lib/puppet/parser/functions/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/lib/puppet/parser/functions/hdp_args_as_array.rb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/lib/puppet/parser/functions/hdp_array_from_comma_list.rb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/lib/puppet/parser/functions/hdp_calc_xmn_from_xms.rb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/lib/puppet/parser/functions/hdp_default.rb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/lib/puppet/parser/functions/hdp_fail.rb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/lib/puppet/parser/functions/hdp_host.rb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/lib/puppet/parser/functions/hdp_host_attribute.rb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/lib/puppet/parser/functions/hdp_is_empty.rb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/lib/puppet/parser/functions/hdp_java_home.rb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/lib/puppet/parser/functions/hdp_no_hosts.rb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/lib/puppet/parser/functions/hdp_option_value.rb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/lib/puppet/parser/functions/hdp_template_var.rb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/lib/puppet/parser/functions/hdp_unique_id_and_date.rb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/lib/puppet/parser/functions/hdp_user.rb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/manifests/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/manifests/.directory
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/manifests/configfile.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/manifests/init.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/manifests/java/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/manifests/java/package.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/manifests/lzo/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/manifests/lzo/package.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/manifests/namenode-conn.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/manifests/package.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/manifests/params.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/manifests/snappy/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/manifests/snappy/package.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/manifests/snmp.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/manifests/testing_env_patch.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/templates/
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/templates/hdp103.repo.erb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp2/templates/snmpd.conf.erb
    incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/test/nagios/
    incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/test/nagios/plugins/
    incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/test/nagios/plugins/test_sys_logger.py
Modified:
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/js/manageServices.js
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/js/selectComponents.js
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/package/rpm/create_hmc_rpm.sh
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/package/rpm/hmc-nodep.spec
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/package/rpm/hmc-php53.spec
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/php/conf/Config.inc
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/php/db/HMCDBAccessor.php
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/php/db/OrchestratorDB.php
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/php/frontend/assignMasters.php
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/php/frontend/configUtils.php
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/php/frontend/createCluster.php
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/php/frontend/deploy.php
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/php/orchestrator/Cluster.php
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/php/puppet/DBReader.php
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/php/puppet/PuppetInvoker.php
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/php/puppet/genmanifest/PuppetClassDependencies.php
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/php/puppet/genmanifest/RoleDependencies.php
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/php/puppet/genmanifest/generateManifest.php
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/php/util/selectNodes.php
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/php/util/suggestProperties.php
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp-hadoop/manifests/params.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp-hadoop/templates/hadoop-env.sh.erb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp-hbase/templates/hbase-env.sh.erb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp-hive/manifests/params.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp-hive/manifests/service.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp-nagios/files/check_aggregate.php
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp-nagios/files/check_datanode_storage.php
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp-nagios/files/check_hdfs_blocks.php
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp-nagios/files/check_hdfs_capacity.php
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp-nagios/files/check_name_dir_status.php
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp-nagios/files/check_oozie_status.sh
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp-nagios/files/check_puppet_agent_status.php
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp-nagios/files/check_rpcq_latency.php
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp-nagios/manifests/server.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp-nagios/templates/hadoop-commands.cfg.erb
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp-oozie/manifests/download-ext-zip.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp-oozie/manifests/params.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp-oozie/manifests/service.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp-templeton/manifests/download-hive-tar.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp-templeton/manifests/download-pig-tar.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp-templeton/manifests/params.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp-templeton/manifests/server.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/puppet/modules/hdp/manifests/params.pp
    incubator/ambari/branches/branch-0.9-h2-dev/hmc/tests/php/orchestrator/test.php
    incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/package/rpm/create_dashboard_rpm.sh
    incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/package/rpm/create_ganglia_addon_rpm.sh
    incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/package/rpm/create_nagios_addon_rpm.sh
    incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/package/rpm/hdp_mon_dashboard.spec
    incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/package/rpm/hdp_mon_ganglia_addons.spec
    incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/package/rpm/hdp_mon_nagios_addons.spec
    incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/ganglia/graph.d/hdp_mon_hdfs_io_report.json
    incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/ganglia/graph.d/hdp_mon_jvm_gc_report.json
    incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/ganglia/graph.d/hdp_mon_jvm_mem_heap_used_report.json
    incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/ganglia/graph.d/hdp_mon_jvm_threads_report.json
    incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/ganglia/graph.d/hdp_mon_rpc_latency_report.json
    incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/ganglia/graph.d/hdp_mon_rpc_queue_time_avg_time_report.json
    incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/ganglia/graph.d/hdp_mon_rpc_queue_time_num_ops_report.json
    incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/ganglia/graph.d/hdp_mon_rpcdetailed_heartbeat_num_ops_report.json
    incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/nagios/plugins/check_aggregate.php
    incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/nagios/plugins/check_hdfs_blocks.php
    incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/nagios/plugins/check_hdfs_capacity.php
    incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/nagios/plugins/check_name_dir_status.php
    incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/nagios/plugins/check_oozie_status.sh
    incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/nagios/plugins/check_rpcq_latency.php
    incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/nagios/plugins/check_webui.sh
    incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/addOns/nagios/scripts/nagios_alerts.php
    incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/dataServices/ganglia/graph_info/dashboard/custom/hdp.json
    incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/ui/hbase.html
    incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/ui/hdfs.html
    incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/ui/home.html
    incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/ui/js/common.js
    incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/src/ui/mapreduce.html
    incubator/ambari/branches/branch-0.9-h2-dev/mon_dashboard/test/dataServices/jmx/data/sample_hbasemaster_jmx.json
    incubator/ambari/branches/branch-0.9-h2-dev/rat-excludes.txt

Modified: incubator/ambari/branches/branch-0.9-h2-dev/hmc/js/manageServices.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9-h2-dev/hmc/js/manageServices.js?rev=1398196&r1=1398195&r2=1398196&view=diff
==============================================================================
--- incubator/ambari/branches/branch-0.9-h2-dev/hmc/js/manageServices.js (original)
+++ incubator/ambari/branches/branch-0.9-h2-dev/hmc/js/manageServices.js Mon Oct 15 05:55:46 2012
@@ -518,6 +518,7 @@ function generateServiceManagementEntryM
     }
 
     var notReconfigurable = [ 'PIG', 'SQOOP', 'OOZIE', 'TEMPLETON', 'GANGLIA', 'HIVE' ];
+    var notReconfigurable = [ 'PIG', 'PIG2', 'SQOOP', 'OOZIE', 'TEMPLETON', 'GANGLIA', 'HIVE', 'HIVE2' ];
     var reconfigureClass;
     if (globalYui.Array.indexOf(notReconfigurable, serviceName) >= 0) {
       reconfigureClass = 'serviceManagementEntryActionReconfigure disabled';

Modified: incubator/ambari/branches/branch-0.9-h2-dev/hmc/js/selectComponents.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9-h2-dev/hmc/js/selectComponents.js?rev=1398196&r1=1398195&r2=1398196&view=diff
==============================================================================
--- incubator/ambari/branches/branch-0.9-h2-dev/hmc/js/selectComponents.js (original)
+++ incubator/ambari/branches/branch-0.9-h2-dev/hmc/js/selectComponents.js Mon Oct 15 05:55:46 2012
@@ -67,7 +67,8 @@ function getServiceComponentListAndRende
           }
           if (!component[componentIndex]['isMaster'] && 
               !component[componentIndex]['isClient'] &&
-              component[componentIndex].componentName != 'HIVE_MYSQL') {
+              component[componentIndex].componentName != 'HIVE_MYSQL' && 
+              component[componentIndex].componentName != 'HIVE2_MYSQL') {
             divContent += '<li class="selectServicesEntry" name=try>';
             divContent +=   '<label class="checkbox" for="install' + serviceName + 'Id">' 
                         +   '<input type="checkbox" disabled="disabled" checked="yes" name="' + serviceName + '" id="install' + serviceName + 'Id" value="' + component[componentIndex].componentName + '"/>'

Modified: incubator/ambari/branches/branch-0.9-h2-dev/hmc/package/rpm/create_hmc_rpm.sh
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9-h2-dev/hmc/package/rpm/create_hmc_rpm.sh?rev=1398196&r1=1398195&r2=1398196&view=diff
==============================================================================
--- incubator/ambari/branches/branch-0.9-h2-dev/hmc/package/rpm/create_hmc_rpm.sh (original)
+++ incubator/ambari/branches/branch-0.9-h2-dev/hmc/package/rpm/create_hmc_rpm.sh Mon Oct 15 05:55:46 2012
@@ -27,16 +27,16 @@ if [[ -z "${BUILD_DIR}" ]]; then
 fi
 
 if [[ -z "${VERSION}" ]]; then
-  VERSION="0.9.0"
+  VERSION="2.0.0.1"
 fi
 
 if [[ -z "${RELEASE}" ]]; then
-  RELEASE="0"
+  RELEASE="1"
 fi
 
 rm -rf ${BUILD_DIR}/*
 
-PKG_NAME="ambari"
+PKG_NAME="hmc"
 
 HMC_DIR="${BUILD_DIR}/${PKG_NAME}-$VERSION/"
 

Modified: incubator/ambari/branches/branch-0.9-h2-dev/hmc/package/rpm/hmc-nodep.spec
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9-h2-dev/hmc/package/rpm/hmc-nodep.spec?rev=1398196&r1=1398195&r2=1398196&view=diff
==============================================================================
--- incubator/ambari/branches/branch-0.9-h2-dev/hmc/package/rpm/hmc-nodep.spec (original)
+++ incubator/ambari/branches/branch-0.9-h2-dev/hmc/package/rpm/hmc-nodep.spec Mon Oct 15 05:55:46 2012
@@ -24,7 +24,7 @@
 
 Summary: HMC without PHP/Ruby dependencies
 Name: hmc-nodep
-Version: 0.9.0
+Version: 1.0.0
 URL: http://hortonworks.com
 Release: 2%{?dist}
 License: Apache License, Version 2.0

Modified: incubator/ambari/branches/branch-0.9-h2-dev/hmc/package/rpm/hmc-php53.spec
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9-h2-dev/hmc/package/rpm/hmc-php53.spec?rev=1398196&r1=1398195&r2=1398196&view=diff
==============================================================================
--- incubator/ambari/branches/branch-0.9-h2-dev/hmc/package/rpm/hmc-php53.spec (original)
+++ incubator/ambari/branches/branch-0.9-h2-dev/hmc/package/rpm/hmc-php53.spec Mon Oct 15 05:55:46 2012
@@ -24,11 +24,11 @@
 
 Summary: HMC for PHP 5.3
 Name: hmc-php53
-Version: 0.9.0
-URL: http://incubator.apache.org/projects/ambari.html
+Version: 1.0.0
+URL: http://hortonworks.com
 Release: 2%{?dist}
 License: Apache License, Version 2.0
-Vendor: Apache Software Foundation <ambari-dev@incubator.apache.org>
+Vendor: Hortonworks <hmc-dev-group@hortonworks.com>
 Group: System Environment/Base
 Source: hmc-%{version}.tar.gz
 Source1: hmc.init.in
@@ -148,5 +148,5 @@ rm -rf /var/run/hmc/puppetmaster.boot
 #%clean
 #%__rm -rf $RPM_BUILD_ROOT
 %changelog
-* Thu Jun 07 2012 Ambari <ambari-dev@incubator.apache.org>
+* Wed Apr 04 2012 Hortonworks <ambari-group@hortonworks.com>
 - Initial version

Modified: incubator/ambari/branches/branch-0.9-h2-dev/hmc/php/conf/Config.inc
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9-h2-dev/hmc/php/conf/Config.inc?rev=1398196&r1=1398195&r2=1398196&view=diff
==============================================================================
--- incubator/ambari/branches/branch-0.9-h2-dev/hmc/php/conf/Config.inc (original)
+++ incubator/ambari/branches/branch-0.9-h2-dev/hmc/php/conf/Config.inc Mon Oct 15 05:55:46 2012
@@ -27,7 +27,7 @@ $GLOBALS["HMC_CLUSTER_PATH"] = "/var/run
 $GLOBALS["BACKGROUND_EXECUTOR_PATH"] = $INSTALL_ROOT . "/php/util/BackgroundExecutor.php";
 $GLOBALS["PHP_EXEC_PATH"] = "/usr/bin/php";
 $GLOBALS["CLUSTERMAIN_PATH"] = $INSTALL_ROOT . "/php/orchestrator/ClusterMain.php";
-$GLOBALS["DB_PATH"] = "/var/db/hmc/data/data.db";
+$GLOBALS["DB_PATH"] = "/var/db/hmc/data/hdp2.db";
 
 $GLOBALS["puppetMaxParallelKicks"] = 10;
 $GLOBALS["puppetMasterModulesDirectory"] = "/etc/puppet/master/modules";
@@ -66,4 +66,6 @@ $GLOBALS["CLUSTERMAIN_PATH"] = "./Cluste
 $GLOBALS["DRYRUN"] = TRUE;
 */
 
+define("AMBARI_HADOOP_1", "1.0");
+define("AMBARI_HADOOP_2", "2.0");
 ?>

Modified: incubator/ambari/branches/branch-0.9-h2-dev/hmc/php/db/HMCDBAccessor.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9-h2-dev/hmc/php/db/HMCDBAccessor.php?rev=1398196&r1=1398195&r2=1398196&view=diff
==============================================================================
--- incubator/ambari/branches/branch-0.9-h2-dev/hmc/php/db/HMCDBAccessor.php (original)
+++ incubator/ambari/branches/branch-0.9-h2-dev/hmc/php/db/HMCDBAccessor.php Mon Oct 15 05:55:46 2012
@@ -100,6 +100,41 @@ class HMCDBAccessor {
   }
 
   /**
+   * Get cluster version for a given clusterName
+   * @param string $clusterName Cluster Name
+   * @return mixed
+   *   array ( "version" => $version,
+   *           "result" => 0,
+   *           "error" => "");
+   */
+  public function getHadoopStackVersion($clusterName) {
+    LockAcquire();
+    $query = "SELECT version FROM Clusters WHERE cluster_name = "
+        . $this->dbHandle->quote($clusterName);
+    $response = array ( "result" => 0, "error" => "");
+    $this->logger->log_trace("Running query: $query");
+    $pdoStmt = $this->dbHandle->query($query);
+    if ($pdoStmt === FALSE) {
+      $error = $this->getLastDBErrorAsString();
+      $this->logger->log_error("Error when executing query"
+          . ", query=".$query
+          . ", error=".$error);
+      $response["result"] = 1;
+      $response["error"] = $error;
+      LockRelease(); return $response;
+    }
+    $result = $pdoStmt->fetchAll(PDO::FETCH_BOTH);
+    if (isset($result) && is_array($result) && count($result) == 1) {
+      $response["version"] = $result[0]["version"];
+      LockRelease(); 
+      return $response;
+    }
+
+    LockRelease(); 
+    return $response;
+  }
+
+  /**
    * Update cluster state for a given clusterName
    * @param string $clusterName Cluster Name
    * @param string $state New state of cluster

Modified: incubator/ambari/branches/branch-0.9-h2-dev/hmc/php/db/OrchestratorDB.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9-h2-dev/hmc/php/db/OrchestratorDB.php?rev=1398196&r1=1398195&r2=1398196&view=diff
==============================================================================
--- incubator/ambari/branches/branch-0.9-h2-dev/hmc/php/db/OrchestratorDB.php (original)
+++ incubator/ambari/branches/branch-0.9-h2-dev/hmc/php/db/OrchestratorDB.php Mon Oct 15 05:55:46 2012
@@ -125,7 +125,7 @@ class OrchestratorDB {
         $this->logger->log_error("Found service with invalid state"
             . ", service=" . $svc["serviceName"]
             . ", state=" . $svc["state"]);
-        $state = STATE::UNKNOWN; // unknown
+        $state = 0; // unknown
       }
 
       $svcObj =
@@ -155,12 +155,6 @@ class OrchestratorDB {
     }
 
     $state = STATE::getStateFromString($serviceInfo["state"]);
-    if ($state === FALSE) {
-      $this->logger->log_error("Found service with invalid state"
-          . ", service=" . $serviceName
-          . ", state=" . $serviceInfo["state"]);
-      $state = STATE::UNKNOWN; // unknown
-    }
     return $this->getServiceObj($serviceName, $state, $this, $this->puppet);
   }
 
@@ -206,7 +200,7 @@ class OrchestratorDB {
         $this->logger->log_error("Found service with invalid state"
             . ", service=" . $svc["serviceName"]
             . ", state=" . $svc["state"]);
-        $state = STATE::UNKNOWN; // unknown
+        $state = 0; // unknown
       }
 
       $svcObj =
@@ -249,7 +243,7 @@ class OrchestratorDB {
         $this->logger->log_warn("Found service with invalid state"
             . ", service=" . $svc["serviceName"]
             . ", state=" . $svc["state"]);
-        $state = STATE::UNKNOWN; // unknown
+        $state = 0; // unknown
       }
 
       $svcObj =
@@ -296,7 +290,7 @@ class OrchestratorDB {
         $this->logger->log_warn("Found component with invalid state"
             . ", component=" . $comp["componentName"]
             . ", state=" . $comp["state"]);
-        $state = STATE::UNKNOWN;
+        $state = 0;
       }
       $isClient = FALSE;
       if (isset($fullCompList[$comp["componentName"]])) {
@@ -317,13 +311,13 @@ class OrchestratorDB {
   }
 
   public function  getNagiosServerComponent() {
-    $svc =  $this->getService("NAGIOS");
+    $svc =  $this->getService("NAGIOS2");
     if ($svc === FALSE) {
       return $svc;
     }
-    $compObjs = $this->getServiceComponents("NAGIOS");
+    $compObjs = $this->getServiceComponents("NAGIOS2");
     foreach ($compObjs as $compObj) {
-      if ($compObj->name == "NAGIOS_SERVER") {
+      if ($compObj->name == "NAGIOS_SERVER2") {
         return $compObj;
       }
     }
@@ -398,7 +392,7 @@ class OrchestratorDB {
         $this->logger->log_error("Found component with invalid state"
             . ", component=" . $comp["componentName"]
             . ", state=" . $comp["state"]);
-        $state = STATE::UNKNOWN;
+        $state = 0;
       }
       $isClient = FALSE;
       if (isset($fullCompList[$comp["componentName"]])) {
@@ -470,7 +464,7 @@ class OrchestratorDB {
         $this->logger->log_error("Found component with invalid state"
         . ", component=" . $comp["componentName"]
         . ", state=" . $comp["state"]);
-        $state = STATE::UNKNOWN;
+        $state = 0;
       }
       $isClient = FALSE;
       if (isset($fullCompList[$comp["componentName"]])) {

Modified: incubator/ambari/branches/branch-0.9-h2-dev/hmc/php/frontend/assignMasters.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9-h2-dev/hmc/php/frontend/assignMasters.php?rev=1398196&r1=1398195&r2=1398196&view=diff
==============================================================================
--- incubator/ambari/branches/branch-0.9-h2-dev/hmc/php/frontend/assignMasters.php (original)
+++ incubator/ambari/branches/branch-0.9-h2-dev/hmc/php/frontend/assignMasters.php Mon Oct 15 05:55:46 2012
@@ -104,11 +104,11 @@ $dbAccessor->addHostsToComponent($cluste
   hack till here */
 
 // choose the name node as the canary host.
-$nameNodeHost = $componentsToHosts["NAMENODE"];
+$nameNodeHost = $componentsToHosts["NAMENODE2"];
 $AllMountPoints = array();
 $nameNodeInfoResult = $dbAccessor->getHostInfo($clusterName, $nameNodeHost[0]);
 if ($nameNodeInfoResult["result"] != 0 ) {
-  $logger->log_error("Got error while getting canary host info ".$nameNodeInfoResult["error"]);
+  $logger->log_error("Got error while getting canary host info for NAMENODE2".$nameNodeInfoResult["error"]);
   print json_encode($nameNodeInfoResult);
   return;
 }
@@ -144,6 +144,35 @@ $outjson = array(
                                                                     "suffix" => "hadoop/hdfs/namesecondary"
                                                                     )
                                             ),
+                                "HDFS2" => array(
+                                             "dfs_name_dir" => array(
+                                                                    "displayName" => "NameNode directories",
+                                                                    "maxDirectoriesNeeded" => -1,
+                                                                    "suffix" => "hadoop/hdfs/namenode"
+                                                                    ),
+                                             "dfs_data_dir" => array(
+                                                                    "displayName" => "DataNode directories",
+                                                                    "maxDirectoriesNeeded" => -1,
+                                                                    "suffix" => "hadoop/hdfs/data"
+                                                                    ),
+                                             "fs_checkpoint_dir" => array(
+                                                                    "displayName" => "SecondaryNameNode Checkpoint directory",
+                                                                    "maxDirectoriesNeeded" => 1,
+                                                                    "suffix" => "hadoop/hdfs/namesecondary"
+                                                                    )
+                                            ),
+                                "YARN" => array(
+                                             "yarn_nm_local_dirs" => array(
+                                                                    "displayName" => "YARN Application Container Directories",
+                                                                    "maxDirectoriesNeeded" => -1,
+                                                                    "suffix" => "hadoop/yarn"
+                                                                    ),
+                                             "yarn_nm_log_dirs" => array(
+                                                                    "displayName" => "YARN Application Container Log Directories",
+                                                                    "maxDirectoriesNeeded" => -1,
+                                                                    "suffix" => "hadoop/yarn"
+                                                                    ),
+                                            ),
                                 "MAPREDUCE" => array(
                                              "mapred_local_dir" => array(
                                                                     "displayName" => "MapReduce Data Directories",
@@ -158,6 +187,13 @@ $outjson = array(
                                                                     "suffix" => "hadoop/oozie"
                                                                    ),
                                             ),
+                                "OOZIE2" => array(
+                                             "oozie_data_dir" => array(
+                                                                    "displayName" => "Oozie DB Directory",
+                                                                    "maxDirectoriesNeeded" => 1,
+                                                                    "suffix" => "hadoop/oozie"
+                                                                   ),
+                                            ),
                                 "ZOOKEEPER" => array(
                                              "zk_data_dir" => array(
                                                                     "displayName" => "ZooKeeper Data Directory",
@@ -165,6 +201,13 @@ $outjson = array(
                                                                     "suffix" => "hadoop/zookeeper"
                                                                   ),
                                            ),
+                                "ZOOKEEPER2" => array(
+                                             "zk_data_dir" => array(
+                                                                    "displayName" => "ZooKeeper Data Directory",
+                                                                    "maxDirectoriesNeeded" => 1,
+                                                                    "suffix" => "hadoop/zookeeper"
+                                                                  ),
+                                           ),
                                 ),
             );
 

Modified: incubator/ambari/branches/branch-0.9-h2-dev/hmc/php/frontend/configUtils.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9-h2-dev/hmc/php/frontend/configUtils.php?rev=1398196&r1=1398195&r2=1398196&view=diff
==============================================================================
--- incubator/ambari/branches/branch-0.9-h2-dev/hmc/php/frontend/configUtils.php (original)
+++ incubator/ambari/branches/branch-0.9-h2-dev/hmc/php/frontend/configUtils.php Mon Oct 15 05:55:46 2012
@@ -413,6 +413,7 @@ function validateConfigs($svcConfigs) {
       scheduler_name|org.apache.hadoop.mapred.CapacityTaskScheduler
       nagios_web_login|nagiosadmin
       nagios_web_password|admin
+      nagios_contact|nagiosadmin@hortonworks.com
       hadoop_heapsize|1024
       namenode_heapsize|1024
       namenode_opt_newsize|200
@@ -456,24 +457,51 @@ function validateConfigs($svcConfigs) {
 function handleHiveMysql($clusterName, $dbAccessor, $logHandle) {
   $services = $dbAccessor->getAllServicesInfo($clusterName);
   $configs = $dbAccessor->getServiceConfig($clusterName);
-  $hostForMysql = $dbAccessor->getHostsForComponent($clusterName, "HIVE_MYSQL");
-  if ( ($services["services"]["HIVE"]["isEnabled"] == 1) &&
-       ( isset($configs["properties"])
-         && ( !isset($configs["properties"]["hive_mysql_host"])
-              || empty($configs["properties"]["hive_mysql_host"])) ) &&
-       (empty($hostForMysql["hosts"])) ) {
-    $logHandle->log_debug("Hive is enabled but mysql server is not set, set it up on hive server itself");
-    $hostComponents = $dbAccessor->getHostsForComponent($clusterName, "HIVE_SERVER");
-    $hiveServerHosts = array_keys($hostComponents["hosts"]);
-    $newConfig = array ( "hive_mysql_host" => "localhost" );  
-    $dbAccessor->updateServiceConfigs($clusterName, $newConfig);
-    $dbAccessor->addHostsToComponent($clusterName, "HIVE_MYSQL",
-          $hiveServerHosts, "ASSIGNED", "");
-  } else {
-    if (isset($configs["properties"])
-        && isset($configs["properties"]["hive_mysql_host"])
-        && $configs["properties"]["hive_mysql_host"] != "localhost") {
-      $dbAccessor->removeAllHostsFromComponent($clusterName, "HIVE_MYSQL");
+
+  $stackVersion = $dbAccessor->getHadoopStackVersion($clusterName);
+  $hadoopVersion = $stackVersion['version'];
+
+  if ($hadoopVersion == AMBARI_HADOOP_1) {
+    $hostForMysql = $dbAccessor->getHostsForComponent($clusterName, "HIVE_MYSQL");
+    if ( ($services["services"]["HIVE"]["isEnabled"] == 1) &&
+         ( isset($configs["properties"])
+           && ( !isset($configs["properties"]["hive_mysql_host"])
+                || empty($configs["properties"]["hive_mysql_host"])) ) &&
+         (empty($hostForMysql["hosts"])) ) {
+      $logHandle->log_debug("Hive is enabled but mysql server is not set, set it up on hive server itself");
+      $hostComponents = $dbAccessor->getHostsForComponent($clusterName, "HIVE_SERVER");
+      $hiveServerHosts = array_keys($hostComponents["hosts"]);
+      $newConfig = array ( "hive_mysql_host" => "localhost" );  
+      $dbAccessor->updateServiceConfigs($clusterName, $newConfig);
+      $dbAccessor->addHostsToComponent($clusterName, "HIVE_MYSQL",
+            $hiveServerHosts, "ASSIGNED", "");
+    } else {
+      if (isset($configs["properties"])
+          && isset($configs["properties"]["hive_mysql_host"])
+          && $configs["properties"]["hive_mysql_host"] != "localhost") {
+        $dbAccessor->removeAllHostsFromComponent($clusterName, "HIVE_MYSQL");
+      }
+    }
+  } else if ($hadoopVersion == AMBARI_HADOOP_2) {
+    $hostForMysql = $dbAccessor->getHostsForComponent($clusterName, "HIVE2_MYSQL");
+    if ( ($services["services"]["HIVE2"]["isEnabled"] == 1) &&
+         ( isset($configs["properties"])
+           && ( !isset($configs["properties"]["hive_mysql_host"])
+                || empty($configs["properties"]["hive_mysql_host"])) ) &&
+         (empty($hostForMysql["hosts"])) ) {
+      $logHandle->log_debug("Hive is enabled but mysql server is not set, set it up on hive server itself");
+      $hostComponents = $dbAccessor->getHostsForComponent($clusterName, "HIVE2_SERVER");
+      $hiveServerHosts = array_keys($hostComponents["hosts"]);
+      $newConfig = array ( "hive_mysql_host" => "localhost" );  
+      $dbAccessor->updateServiceConfigs($clusterName, $newConfig);
+      $dbAccessor->addHostsToComponent($clusterName, "HIVE2_MYSQL",
+            $hiveServerHosts, "ASSIGNED", "");
+    } else {
+      if (isset($configs["properties"])
+          && isset($configs["properties"]["hive_mysql_host"])
+          && $configs["properties"]["hive_mysql_host"] != "localhost") {
+        $dbAccessor->removeAllHostsFromComponent($clusterName, "HIVE2_MYSQL");
+      }
     }
   }
 }

Modified: incubator/ambari/branches/branch-0.9-h2-dev/hmc/php/frontend/createCluster.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9-h2-dev/hmc/php/frontend/createCluster.php?rev=1398196&r1=1398195&r2=1398196&view=diff
==============================================================================
--- incubator/ambari/branches/branch-0.9-h2-dev/hmc/php/frontend/createCluster.php (original)
+++ incubator/ambari/branches/branch-0.9-h2-dev/hmc/php/frontend/createCluster.php Mon Oct 15 05:55:46 2012
@@ -84,7 +84,7 @@ fclose($fileHdl);
 $dbAccessor->wipeOutClusters($clusterName);
 $logger->log_info("Completed deletion of cluster: ".$clusterName);
 
-$hdpVersion="1.0"; // TODO: hardcoded
+$hdpVersion="2.0"; // TODO: hardcoded
 $state="Configuration in progress";
 
 $response = $dbAccessor->createCluster($clusterName, $hdpVersion, $state);

Modified: incubator/ambari/branches/branch-0.9-h2-dev/hmc/php/frontend/deploy.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9-h2-dev/hmc/php/frontend/deploy.php?rev=1398196&r1=1398195&r2=1398196&view=diff
==============================================================================
--- incubator/ambari/branches/branch-0.9-h2-dev/hmc/php/frontend/deploy.php (original)
+++ incubator/ambari/branches/branch-0.9-h2-dev/hmc/php/frontend/deploy.php Mon Oct 15 05:55:46 2012
@@ -106,7 +106,7 @@ $nagiosGangliaCoHosted = FALSE;
 // check if nagios hosted on same server
 if (!$nagiosGangliaCoHosted) {
   // check if component mapped to this host
-  $hostMap = $dbAccessor->getHostsForComponent($clusterName, "NAGIOS_SERVER");
+  $hostMap = $dbAccessor->getHostsForComponent($clusterName, "NAGIOS_SERVER2");
   if (isset($hostMap["hosts"][$thisHostName])) {
     $nagiosGangliaCoHosted = TRUE;
   }
@@ -115,8 +115,16 @@ if (!$nagiosGangliaCoHosted) {
 // if still nothing then check if ganglia server installed on same server
 if (!$nagiosGangliaCoHosted) {
   // check if component mapped to this host
+  $stackVersion = $dbAccessor->getHadoopStackVersion($clusterName);
+  $hadoopVersion = $stackVersion['version'];
+  $gmServerName = "";
+  if($hadoopVersion == AMBARI_HADOOP_1) {
+    $gmServerName = "GANGLIA_MONITOR_SERVER";
+  } else if ($hadoopVersion == AMBARI_HADOOP_2) {
+    $gmServerName = "GANGLIA2_MONITOR_SERVER";
+  }
   $hostMap = $dbAccessor->getHostsForComponent($clusterName,
-      "GANGLIA_MONITOR_SERVER");
+      $gmServerName);
   if (isset($hostMap["hosts"][$thisHostName])) {
     $nagiosGangliaCoHosted = TRUE;
   }

Modified: incubator/ambari/branches/branch-0.9-h2-dev/hmc/php/orchestrator/Cluster.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9-h2-dev/hmc/php/orchestrator/Cluster.php?rev=1398196&r1=1398195&r2=1398196&view=diff
==============================================================================
--- incubator/ambari/branches/branch-0.9-h2-dev/hmc/php/orchestrator/Cluster.php (original)
+++ incubator/ambari/branches/branch-0.9-h2-dev/hmc/php/orchestrator/Cluster.php Mon Oct 15 05:55:46 2012
@@ -345,7 +345,7 @@ class Cluster {
       $result = $nagiosComp->stop($transaction->createSubTransaction(), $dryRun);
       if ($result["result"] != 0) {
         $this->setState(State::FAILED, $transaction, $dryRun);
-        $nagiosService = $this->db->getService("NAGIOS");
+        $nagiosService = $this->db->getService("NAGIOS2");
         if ($nagiosService !== FALSE) {
           $nagiosService->setState(STATE::FAILED,
               $transaction->createSubTransaction(), $dryRun, FALSE);

Modified: incubator/ambari/branches/branch-0.9-h2-dev/hmc/php/puppet/DBReader.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9-h2-dev/hmc/php/puppet/DBReader.php?rev=1398196&r1=1398195&r2=1398196&view=diff
==============================================================================
--- incubator/ambari/branches/branch-0.9-h2-dev/hmc/php/puppet/DBReader.php (original)
+++ incubator/ambari/branches/branch-0.9-h2-dev/hmc/php/puppet/DBReader.php Mon Oct 15 05:55:46 2012
@@ -33,6 +33,14 @@ class DBReader {
     $this->logger = new HMCLogger("DBReader");
   }
 
+  public function getHadoopStackVersion($clusterName, $dbAccessor = NULL) {
+    if ($dbAccessor == NULL) {
+      $dbAccessor = new HMCDBAccessor($this->dbPath);
+    }
+    $ret = $dbAccessor->getHadoopStackVersion($clusterName);
+    return $ret["version"];
+  }
+
   public function getAllConfigs($clusterId) {
     $dbAccessor = new HMCDBAccessor($this->dbPath);
     $allConfigs = $dbAccessor->getServiceConfig($clusterId);
@@ -60,18 +68,20 @@ class DBReader {
   public function getHostNames($clusterId) {
     $dbAccessor = new HMCDBAccessor($this->dbPath);
     $allHostComponents = $dbAccessor->getAllHostsByComponent($clusterId);
+    $hadoopVersion = $this->getHadoopStackVersion($clusterId, $dbAccessor);
+    $hostKeyMap = ($hadoopVersion == AMBARI_HADOOP_2) ? $this->hadoop2_hostKeyMap : $this->hadoop1_hostKeyMap;
     $hostNames = array();
     foreach ($allHostComponents["components"] as $componentName => $componentInfo) {
       if (!isset($componentInfo["hosts"])) {
         continue;
       }
       foreach($componentInfo["hosts"] as $hostname => $hostInfo) {
-        if (!isset($this->hostKeyMap[$componentName])) {
+        if (!isset($hostKeyMap[$componentName])) {
           $this->logger->log_trace("No puppet handling needed for  component "
               . $componentName);
           continue;
         }
-        $puppetHostKey = $this->hostKeyMap[$componentName];
+        $puppetHostKey = $hostKeyMap[$componentName];
         if (!isset($hostNames[$puppetHostKey])) {
           $hostNames[$puppetHostKey] = array();
         }
@@ -88,6 +98,8 @@ class DBReader {
     $dbAccessor = new HMCDBAccessor($this->dbPath);
     $allHostComponents = $dbAccessor->getAllHostsByComponent($clusterId);
     $allHostRoleConfigs = $dbAccessor->getHostRoleConfigs($clusterId);
+    $hadoopVersion = $this->getHadoopStackVersion($clusterId, $dbAccessor);
+    $componentToPuppetClassMap = ($hadoopVersion == AMBARI_HADOOP_2) ? $this->hadoop2_componentToPuppetClassMap : $this->hadoop1_componentToPuppetClassMap;
     $hostRoles = array();
     foreach ($allHostComponents["components"] as $componentName => $componentInfo) {
       if (!isset($componentInfo["hosts"])) {
@@ -100,12 +112,12 @@ class DBReader {
         if (!isset($hostRoles[$hostname])) {
           $hostRoles[$hostname] = array();
         }
-        if (!isset($this->componentToPuppetClassMap[$componentName])) {
+        if (!isset($componentToPuppetClassMap[$componentName])) {
           $this->logger->log_trace("No puppet handling needed for component "
               . $componentName);
           continue;
         }
-        $puppetClass = $this->componentToPuppetClassMap[$componentName];
+        $puppetClass = $componentToPuppetClassMap[$componentName];
         $hostRoles[$hostname][$puppetClass] = array();
         if (in_array($componentName, $components)) {
             $hostRoles[$hostname][$puppetClass]["service_state"] =
@@ -126,7 +138,7 @@ class DBReader {
     return $hostRoles;
   }
 
-  private $componentToPuppetClassMap = array (
+  private $hadoop1_componentToPuppetClassMap = array (
       "NAMENODE" => "hdp-hadoop::namenode",
       "DATANODE"=> "hdp-hadoop::datanode",
       "SNAMENODE" => "hdp-hadoop::snamenode",
@@ -134,7 +146,7 @@ class DBReader {
       "TASKTRACKER" => "hdp-hadoop::tasktracker",
       "HDFS_CLIENT" => "hdp-hadoop::client",
       "MAPREDUCE_CLIENT" => "hdp-hadoop::client",
-      "ZOOKEEPER_SERVER" => "hdp-zookeeper",
+  		"ZOOKEEPER_SERVER" => "hdp-zookeeper",
       "ZOOKEEPER_CLIENT" => "hdp-zookeeper::client",
       "HBASE_MASTER" => "hdp-hbase::master",
       "HBASE_REGIONSERVER" => "hdp-hbase::regionserver",
@@ -157,13 +169,45 @@ class DBReader {
       "HTTPD" => "hdp-monitor-webserver"
     );
 
+  private $hadoop2_componentToPuppetClassMap = array (
+      "NAMENODE2" => "hdp2-hadoop::namenode",
+      "DATANODE2"=> "hdp2-hadoop::datanode",
+      "SNAMENODE2" => "hdp2-hadoop::snamenode",
+      "RESOURCEMANAGER" => "hdp2-hadoop::resourcemanager",
+      "NODEMANAGER" => "hdp2-hadoop::nodemanager",
+      "HDFS2_CLIENT" => "hdp2-hadoop::client",
+      "YARN_CLIENT" => "hdp2-hadoop::client",
+  		"MAPREDUCE2_CLIENT" => "hdp2-hadoop::client",
+  		"ZOOKEEPER2_SERVER" => "hdp2-zookeeper",
+      "ZOOKEEPER2_CLIENT" => "hdp2-zookeeper::client",
+      "HBASE2_MASTER" => "hdp2-hbase::master",
+      "HBASE2_REGIONSERVER" => "hdp2-hbase::regionserver",
+      "HBASE2_CLIENT" => "hdp2-hbase::client",
+      "PIG2_CLIENT" => "hdp2-pig",
+      "SQOOP_CLIENT" => "hdp-sqoop",
+      "OOZIE2_SERVER" => "hdp2-oozie::server",
+      "OOZIE2_CLIENT" => "hdp2-oozie::client",
+      "HIVE2_CLIENT" => "hdp2-hive::client",
+      "HCATALOG2_CLIENT" => "hdp2-hcat",
+      "HCATALOG2_SERVER" => "hdp2-hcat::server",
+      "HIVE2_SERVER" => "hdp2-hive::server",
+      "HIVE2_MYSQL" => "hdp2-mysql::server",
+      "TEMPLETON_SERVER" => "hdp-templeton::server",
+      "TEMPLETON_CLIENT" => "hdp-templeton::client",
+      "DASHBOARD" => "hdp-dashboard",
+      "NAGIOS_SERVER2" => "hdp2-nagios::server",
+      "GANGLIA2_MONITOR_SERVER" => "hdp2-ganglia::server",
+      "GANGLIA2_MONITOR" => "hdp2-ganglia::monitor",
+      "HTTPD" => "hdp-monitor-webserver"
+    );
+
   //Store the database key for each role
-  private $hostKeyMap =
+  private $hadoop1_hostKeyMap =
     array(
         "NAMENODE" => "namenode_host",
         "JOBTRACKER" => "jtnode_host",
         "SNAMENODE" => "snamenode_host",
-        "ZOOKEEPER_SERVER" => "zookeeper_hosts",
+    		"ZOOKEEPER_SERVER" => "zookeeper_hosts",
         "HBASE_MASTER" => "hbase_master_host",
         "HCATALOG_SERVER" => "hcat_server_host",
         "HIVE_SERVER" => "hive_server_host",
@@ -177,6 +221,25 @@ class DBReader {
         "HBASE_REGIONSERVER" => "hbase_rs_hosts"
         );
 
+  private $hadoop2_hostKeyMap =
+    array(
+        "NAMENODE2" => "namenode_host",
+        "RESOURCEMANAGER" => "yarn_rm_host",
+        "SNAMENODE2" => "snamenode_host",
+    		"ZOOKEEPER2_SERVER" => "zookeeper_hosts",
+        "HBASE2_MASTER" => "hbase_master_host",
+        "HCATALOG2_SERVER" => "hcat_server_host",
+        "HIVE2_SERVER" => "hive_server_host",
+        "OOZIE2_SERVER" => "oozie_server",
+        "TEMPLETON_SERVER" => "templeton_server_host",
+        "DASHBOARD" => "dashboard_host",
+        "NAGIOS_SERVER2" => "nagios_server_host",
+        "GANGLIA2_MONITOR_SERVER" => "ganglia_server_host",
+        "DATANODE2" => "slave_hosts",
+        "NODEMANAGER" => "slave_hosts",
+        "HBASE2_REGIONSERVER" => "hbase_rs_hosts"
+        );
+
   /****** Not used but may be used later *****
   //Store the database key for each configuration
   private $configKeyMap =

Modified: incubator/ambari/branches/branch-0.9-h2-dev/hmc/php/puppet/PuppetInvoker.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9-h2-dev/hmc/php/puppet/PuppetInvoker.php?rev=1398196&r1=1398195&r2=1398196&view=diff
==============================================================================
--- incubator/ambari/branches/branch-0.9-h2-dev/hmc/php/puppet/PuppetInvoker.php (original)
+++ incubator/ambari/branches/branch-0.9-h2-dev/hmc/php/puppet/PuppetInvoker.php Mon Oct 15 05:55:46 2012
@@ -183,7 +183,8 @@
       $txnId = $txnObj->toString();
 
       $hostRolesStates = array();
-      $roleDependencies = new RoleDependencies();
+      $dbReader = new DBReader($this->db, $clusterName);
+      $roleDependencies = new RoleDependencies($dbReader->getHadoopStackVersion($clusterName));
       $nodeList = array();
       foreach($serviceCheckNodes as $service => $node) {
         $rs = $roleDependencies->getServiceCheckRole($service);
@@ -199,7 +200,6 @@
         $hostRolesStates[$node][$rs] = array();
       }
       $nodesToKick = array_unique($nodeList);
-      $dbReader = new DBReader($this->db);
       $hostInfo = $dbReader->getHostNames($clusterName);
       $configInfo = $dbReader->getAllConfigs($clusterName);
       $hostAttributes = $dbReader->getAllHostAttributes($clusterName);
@@ -258,8 +258,9 @@
       copy($GLOBALS["manifestloaderDir"] . "/site.pp", $GLOBALS["manifestloaderDestinationDir"] . "/site.pp");
 
       //Generate manifest
+       $dbReader = new DBReader($this->db);
       $agentModulesDir = $GLOBALS["puppetAgentModulesDirectory"];
-      ManifestGenerator::generateManifest($manifestDir, $hostInfo,
+      ManifestGenerator::generateManifest($dbReader, $clusterId, $manifestDir, $hostInfo,
           $configInfo, $hostRolesStates, $hostAttributes, $agentModulesDir);
 
       //Write version file
@@ -267,6 +268,11 @@
 
       if ($dryRun) {
         $successfullNodes = $nodes;
+        
+        //Archive
+        $sitePPFile = $manifestDir . "/site.pp";
+        system("mv " . $sitePPFile . " " . $GLOBALS["manifestloaderDir"] . "/site.pp-" . $txnId);
+        
         return $this->createGenKickWaitResponse($kickFailedNodes, $failureResponseNodes,
            $timedoutNodes, $successfullNodes, $nodes);
       }
@@ -333,7 +339,7 @@
       while (true) {
         $this->checkForReportFiles($nodes, $txnId, $doneNodes);
         $this->logger->log_info(count($doneNodes) . " out of " . count($nodes) 
-            . " nodes have reported");
+            . " nodes have reported for txn " . $txnId);
         if (count($doneNodes) >= count($nodes)) {
           ##All nodes kicked have reported back
           break;

Modified: incubator/ambari/branches/branch-0.9-h2-dev/hmc/php/puppet/genmanifest/PuppetClassDependencies.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9-h2-dev/hmc/php/puppet/genmanifest/PuppetClassDependencies.php?rev=1398196&r1=1398195&r2=1398196&view=diff
==============================================================================
--- incubator/ambari/branches/branch-0.9-h2-dev/hmc/php/puppet/genmanifest/PuppetClassDependencies.php (original)
+++ incubator/ambari/branches/branch-0.9-h2-dev/hmc/php/puppet/genmanifest/PuppetClassDependencies.php Mon Oct 15 05:55:46 2012
@@ -47,12 +47,15 @@ class PuppetClassDependencies {
 
     //HDFS
     $this->addDependency("hdp-hadoop::namenode", SERVICE_STATE_RUNNING, "hdp-hadoop::namenode::service_check", array());
-
+    $this->addDependency("hdp2-hadoop::namenode", SERVICE_STATE_RUNNING, "hdp2-hadoop::namenode::service_check", array());
+    
     //MapReduce
     $this->addDependency("hdp-hadoop::jobtracker", SERVICE_STATE_RUNNING, "hdp-hadoop::jobtracker::service_check", array());
+    $this->addDependency("hdp2-hadoop::resourcemanager", SERVICE_STATE_RUNNING, "hdp2-hadoop::resourcemanager::service_check", array());
 
     //ZooKeeper
     $this->addDependency("hdp-zookeeper", SERVICE_STATE_RUNNING, "hdp-zookeeper::zookeeper::service_check", array());
+    $this->addDependency("hdp2-zookeeper", SERVICE_STATE_RUNNING, "hdp2-zookeeper::zookeeper::service_check", array());
 
     //HBase
     $this->addDependency("hdp-hbase::master", SERVICE_STATE_INSTALLED_AND_CONFIGURED, "hdp-zookeeper::client",
@@ -60,31 +63,61 @@ class PuppetClassDependencies {
     $this->addDependency("hdp-hbase::master", SERVICE_STATE_INSTALLED_AND_CONFIGURED, "hdp-hadoop::client",
         array("service_state" => SERVICE_STATE_INSTALLED_AND_CONFIGURED));
 
+    $this->addDependency("hdp2-hbase::master", SERVICE_STATE_INSTALLED_AND_CONFIGURED, "hdp2-zookeeper::client",
+        array("service_state" => SERVICE_STATE_INSTALLED_AND_CONFIGURED));
+    $this->addDependency("hdp2-hbase::master", SERVICE_STATE_INSTALLED_AND_CONFIGURED, "hdp2-hadoop::client",
+        array("service_state" => SERVICE_STATE_INSTALLED_AND_CONFIGURED));
+
     $this->addDependency("hdp-hbase::master", SERVICE_STATE_RUNNING, "hdp-zookeeper::client",
         array("service_state" => SERVICE_STATE_NO_OP));
     $this->addDependency("hdp-hbase::master", SERVICE_STATE_RUNNING, "hdp-hadoop::client",
         array("service_state" => SERVICE_STATE_NO_OP));
 
+    $this->addDependency("hdp2-hbase::master", SERVICE_STATE_RUNNING, "hdp2-zookeeper::client",
+        array("service_state" => SERVICE_STATE_NO_OP));
+    $this->addDependency("hdp2-hbase::master", SERVICE_STATE_RUNNING, "hdp2-hadoop::client",
+        array("service_state" => SERVICE_STATE_NO_OP));
+
     $this->addDependency("hdp-hbase::master", SERVICE_STATE_UNINSTALLED, "hdp-zookeeper::client",
         array("service_state" => SERVICE_STATE_UNINSTALLED));
     $this->addDependency("hdp-hbase::master", SERVICE_STATE_UNINSTALLED, "hdp-hadoop::client",
         array("service_state" => SERVICE_STATE_UNINSTALLED));
 
+    $this->addDependency("hdp2-hbase::master", SERVICE_STATE_UNINSTALLED, "hdp2-zookeeper::client",
+        array("service_state" => SERVICE_STATE_UNINSTALLED));
+    $this->addDependency("hdp2-hbase::master", SERVICE_STATE_UNINSTALLED, "hdp2-hadoop::client",
+        array("service_state" => SERVICE_STATE_UNINSTALLED));
+
     $this->addDependency("hdp-hbase::regionserver", SERVICE_STATE_INSTALLED_AND_CONFIGURED, "hdp-zookeeper::client",
         array("service_state" => SERVICE_STATE_INSTALLED_AND_CONFIGURED));
     $this->addDependency("hdp-hbase::regionserver", SERVICE_STATE_INSTALLED_AND_CONFIGURED, "hdp-hadoop::client",
         array("service_state" => SERVICE_STATE_INSTALLED_AND_CONFIGURED));
 
+    $this->addDependency("hdp2-hbase::regionserver", SERVICE_STATE_INSTALLED_AND_CONFIGURED, "hdp2-zookeeper::client",
+        array("service_state" => SERVICE_STATE_INSTALLED_AND_CONFIGURED));
+    $this->addDependency("hdp2-hbase::regionserver", SERVICE_STATE_INSTALLED_AND_CONFIGURED, "hdp2-hadoop::client",
+        array("service_state" => SERVICE_STATE_INSTALLED_AND_CONFIGURED));
+
     $this->addDependency("hdp-hbase::regionserver", SERVICE_STATE_RUNNING, "hdp-zookeeper::client",
         array("service_state" => SERVICE_STATE_NO_OP));
     $this->addDependency("hdp-hbase::regionserver", SERVICE_STATE_RUNNING, "hdp-hadoop::client",
         array("service_state" => SERVICE_STATE_NO_OP));
 
+    $this->addDependency("hdp2-hbase::regionserver", SERVICE_STATE_RUNNING, "hdp2-zookeeper::client",
+        array("service_state" => SERVICE_STATE_NO_OP));
+    $this->addDependency("hdp2-hbase::regionserver", SERVICE_STATE_RUNNING, "hdp2-hadoop::client",
+        array("service_state" => SERVICE_STATE_NO_OP));
+
     $this->addDependency("hdp-hbase::regionserver", SERVICE_STATE_UNINSTALLED, "hdp-zookeeper::client",
         array("service_state" => SERVICE_STATE_UNINSTALLED));
     $this->addDependency("hdp-hbase::regionserver", SERVICE_STATE_UNINSTALLED, "hdp-hadoop::client",
         array("service_state" => SERVICE_STATE_UNINSTALLED));
 
+    $this->addDependency("hdp2-hbase::regionserver", SERVICE_STATE_UNINSTALLED, "hdp2-zookeeper::client",
+        array("service_state" => SERVICE_STATE_UNINSTALLED));
+    $this->addDependency("hdp2-hbase::regionserver", SERVICE_STATE_UNINSTALLED, "hdp2-hadoop::client",
+        array("service_state" => SERVICE_STATE_UNINSTALLED));
+
     //Oozie
     $this->addDependency("hdp-oozie::server", SERVICE_STATE_INSTALLED_AND_CONFIGURED, "hdp-hadoop::client",
         array("service_state" => SERVICE_STATE_INSTALLED_AND_CONFIGURED));
@@ -93,6 +126,13 @@ class PuppetClassDependencies {
     $this->addDependency("hdp-oozie::server", SERVICE_STATE_UNINSTALLED, "hdp-hadoop::client",
         array("service_state" => SERVICE_STATE_UNINSTALLED));
 
+    $this->addDependency("hdp2-oozie::server", SERVICE_STATE_INSTALLED_AND_CONFIGURED, "hdp2-hadoop::client",
+        array("service_state" => SERVICE_STATE_INSTALLED_AND_CONFIGURED));
+    $this->addDependency("hdp2-oozie::server", SERVICE_STATE_RUNNING, "hdp2-hadoop::client",
+        array("service_state" => SERVICE_STATE_NO_OP));
+    $this->addDependency("hdp2-oozie::server", SERVICE_STATE_UNINSTALLED, "hdp2-hadoop::client",
+        array("service_state" => SERVICE_STATE_UNINSTALLED));
+
     //Hive depends on Hcat
     $this->addDependency("hdp-hive::server", SERVICE_STATE_INSTALLED_AND_CONFIGURED, "hdp-hcat",
         array("service_state" => SERVICE_STATE_INSTALLED_AND_CONFIGURED));
@@ -106,10 +146,25 @@ class PuppetClassDependencies {
     $this->addDependency("hdp-hive::client", SERVICE_STATE_UNINSTALLED, "hdp-hcat",
         array("service_state" => SERVICE_STATE_UNINSTALLED));
 
+    $this->addDependency("hdp2-hive::server", SERVICE_STATE_INSTALLED_AND_CONFIGURED, "hdp2-hcat",
+        array("service_state" => SERVICE_STATE_INSTALLED_AND_CONFIGURED));
+    $this->addDependency("hdp2-hive::server", SERVICE_STATE_RUNNING, "hdp2-hcat",
+        array("service_state" => SERVICE_STATE_NO_OP));
+    $this->addDependency("hdp2-hive::server", SERVICE_STATE_UNINSTALLED, "hdp2-hcat",
+        array("service_state" => SERVICE_STATE_UNINSTALLED));
+
+    $this->addDependency("hdp2-hive::client", SERVICE_STATE_INSTALLED_AND_CONFIGURED, "hdp2-hcat",
+        array("service_state" => SERVICE_STATE_INSTALLED_AND_CONFIGURED));
+    $this->addDependency("hdp2-hive::client", SERVICE_STATE_UNINSTALLED, "hdp2-hcat",
+        array("service_state" => SERVICE_STATE_UNINSTALLED));
+
     //Hive Service Check
     $this->addDependency("hdp-hive::hive::service_check", SERVICE_STATE_NOT_APPLICABLE, 
         "hdp-hcat::hcat::service_check", array());
 
+    $this->addDependency("hdp2-hive::hive::service_check", SERVICE_STATE_NOT_APPLICABLE, 
+        "hdp2-hcat::hcat::service_check", array());
+
     //Pig
     $this->addDependency("hdp-pig", SERVICE_STATE_INSTALLED_AND_CONFIGURED, "hdp-hadoop::client",
         array("service_state" => SERVICE_STATE_INSTALLED_AND_CONFIGURED));
@@ -117,6 +172,12 @@ class PuppetClassDependencies {
     $this->addDependency("hdp-pig", SERVICE_STATE_UNINSTALLED, "hdp-hadoop::client",
         array("service_state" => SERVICE_STATE_UNINSTALLED));
 
+    $this->addDependency("hdp2-pig", SERVICE_STATE_INSTALLED_AND_CONFIGURED, "hdp2-hadoop::client",
+        array("service_state" => SERVICE_STATE_INSTALLED_AND_CONFIGURED));
+
+    $this->addDependency("hdp2-pig", SERVICE_STATE_UNINSTALLED, "hdp2-hadoop::client",
+        array("service_state" => SERVICE_STATE_UNINSTALLED));
+
     //Sqoop
     $this->addDependency("hdp-sqoop", SERVICE_STATE_INSTALLED_AND_CONFIGURED, "hdp-hadoop::client",
         array("service_state" => SERVICE_STATE_INSTALLED_AND_CONFIGURED));
@@ -157,31 +218,38 @@ class PuppetClassDependencies {
     $this->addDependency("hdp-ganglia::server", SERVICE_STATE_RUNNING, "hdp-ganglia::hdp-gmetad::service_check", array());
     $this->addDependency("hdp-ganglia::server", SERVICE_STATE_RUNNING, "hdp-monitor-webserver", array());
 
+    $this->addDependency("hdp2-ganglia::monitor", SERVICE_STATE_RUNNING, "hdp2-ganglia::hdp-gmond::service_check", array());
+    $this->addDependency("hdp2-ganglia::server", SERVICE_STATE_RUNNING, "hdp2-ganglia::hdp-gmetad::service_check", array());
+    $this->addDependency("hdp2-ganglia::server", SERVICE_STATE_RUNNING, "hdp-monitor-webserver", array());
+
     //Nagios
-    $this->addDependency("hdp-nagios::server", SERVICE_STATE_INSTALLED_AND_CONFIGURED, "hdp-oozie::client",
+    $this->addDependency("hdp2-nagios::server", SERVICE_STATE_INSTALLED_AND_CONFIGURED, "hdp2-oozie::client",
         array("service_state" => SERVICE_STATE_INSTALLED_AND_CONFIGURED));
-    $this->addDependency("hdp-nagios::server", SERVICE_STATE_INSTALLED_AND_CONFIGURED, "hdp-hcat",
+    $this->addDependency("hdp2-nagios::server", SERVICE_STATE_INSTALLED_AND_CONFIGURED, "hdp2-hcat",
         array("service_state" => SERVICE_STATE_INSTALLED_AND_CONFIGURED));
-    $this->addDependency("hdp-nagios::server", SERVICE_STATE_INSTALLED_AND_CONFIGURED, "hdp-hive::client",
+    $this->addDependency("hdp2-nagios::server", SERVICE_STATE_INSTALLED_AND_CONFIGURED, "hdp2-hive::client",
         array("service_state" => SERVICE_STATE_INSTALLED_AND_CONFIGURED));
 
-    $this->addDependency("hdp-nagios::server", SERVICE_STATE_RUNNING, "hdp-oozie::client",
+    $this->addDependency("hdp2-nagios::server", SERVICE_STATE_RUNNING, "hdp2-oozie::client",
         array("service_state" => SERVICE_STATE_NO_OP));
-    $this->addDependency("hdp-nagios::server", SERVICE_STATE_RUNNING, "hdp-hcat",
+    $this->addDependency("hdp2-nagios::server", SERVICE_STATE_RUNNING, "hdp2-hcat",
         array("service_state" => SERVICE_STATE_NO_OP));
-    $this->addDependency("hdp-nagios::server", SERVICE_STATE_RUNNING, "hdp-hive::client",
+    $this->addDependency("hdp2-nagios::server", SERVICE_STATE_RUNNING, "hdp2-hive::client",
         array("service_state" => SERVICE_STATE_NO_OP));
 
-    $this->addDependency("hdp-nagios::server", SERVICE_STATE_UNINSTALLED, "hdp-oozie::client",
+    $this->addDependency("hdp2-nagios::server", SERVICE_STATE_UNINSTALLED, "hdp2-oozie::client",
         array("service_state" => SERVICE_STATE_UNINSTALLED));
-    $this->addDependency("hdp-nagios::server", SERVICE_STATE_UNINSTALLED, "hdp-hcat",
+    $this->addDependency("hdp2-nagios::server", SERVICE_STATE_UNINSTALLED, "hdp2-hcat",
         array("service_state" => SERVICE_STATE_UNINSTALLED));
-    $this->addDependency("hdp-nagios::server", SERVICE_STATE_UNINSTALLED, "hdp-hive::client",
+    $this->addDependency("hdp2-nagios::server", SERVICE_STATE_UNINSTALLED, "hdp2-hive::client",
         array("service_state" => SERVICE_STATE_UNINSTALLED));
 
     $this->addDependency("hdp-nagios::server", SERVICE_STATE_RUNNING, "hdp-nagios::nagios::service_check", array());
     $this->addDependency("hdp-nagios::server", SERVICE_STATE_RUNNING, "hdp-monitor-webserver", array());
 
+    $this->addDependency("hdp2-nagios::server", SERVICE_STATE_RUNNING, "hdp2-nagios::nagios::service_check", array());
+    $this->addDependency("hdp2-nagios::server", SERVICE_STATE_RUNNING, "hdp-monitor-webserver", array());
+
     //Dashboard
     $this->addDependency("hdp-dashboard", SERVICE_STATE_RUNNING, "hdp-dashboard::dashboard::service_check", array());
   }
@@ -205,7 +273,7 @@ class PuppetClassDependencies {
   }
 
   public function getHostLevelDependencies($role, $serviceState) {
-    $dependencies = array("hdp" => array() );
+    $dependencies = array("hdp2" => array() );
     if (!isset($this->hostLevelDependencies[$role][$serviceState])) {
       return $dependencies;
     }



Mime
View raw message