Updated Branches: refs/heads/trunk f603882f8 -> 5f1637dd2
Revert "AMBARI-3696. Smoke test for YARN uses the hostname in yarn.resourcemanager.webapp.address for smoke tests. (Artem Baranchuk via dlysnichenko)" Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/5f1637dd Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/5f1637dd Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/5f1637dd Branch: refs/heads/trunk Commit: 5f1637dd2532adae5214b999705c6ef83fa9ea1b Parents: f603882 Author: Lisnichenko Dmitro <[email protected]> Authored: Wed Nov 6 18:38:01 2013 +0200 Committer: Lisnichenko Dmitro <[email protected]> Committed: Wed Nov 6 18:38:01 2013 +0200 ---------------------------------------------------------------------- .../src/main/puppet/modules/hdp-yarn/manifests/params.pp | 7 ++----- ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp | 2 -- 2 files changed, 2 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/5f1637dd/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/params.pp ---------------------------------------------------------------------- diff --git a/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/params.pp b/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/params.pp index a5ca430..637b515 100644 --- a/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/params.pp +++ b/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/params.pp @@ -29,9 +29,6 @@ class hdp-yarn::params( $security_enabled = $hdp::params::security_enabled $smoke_user_keytab = $hdp::params::smokeuser_keytab $kinit_cmd = "${hdp::params::kinit_path_local} -kt ${smoke_user_keytab} ${smoke_test_user};" - $rm_host = $hdp::params::rm_host - $rm_port = $hdp::params::rm_port - $rm_https_port = $hdp::params::rm_https_port ## yarn-env $hadoop_libexec_dir = $hdp-hadoop::params::hadoop_libexec_dir @@ -44,8 +41,8 @@ class hdp-yarn::params( $yarn_pid_dir_prefix = hdp_default("yarn_pid_dir_prefix","/var/run/hadoop-yarn") ## yarn-site - $rm_webui_address = "${rm_host}:${rm_port}" - $rm_webui_https_address = "${rm_host}:${rm_https_port}" + $rm_webui_address = hdp_default("yarn-site/yarn.resourcemanager.webapp.address", "0.0.0.0:8088") + $rm_webui_https_address = hdp_default("yarn-site/yarn.resourcemanager.webapp.https.address", "0.0.0.0:8090") $nm_webui_address = hdp_default("yarn-site/yarn.nodemanager.webapp.address", "0.0.0.0:8042") $hs_webui_address = hdp_default("mapred-site/mapreduce.jobhistory.webapp.address", "0.0.0.0:19888") http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/5f1637dd/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp ---------------------------------------------------------------------- diff --git a/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp b/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp index 95feb3c..c86b6e9 100644 --- a/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp +++ b/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp @@ -88,8 +88,6 @@ class hdp::params() $zookeeper_hosts = hdp_default("zookeeper_hosts") $flume_hosts = hdp_default("flume_hosts") - $rm_port = hdp_get_port_from_url($yarn-site["yarn.resourcemanager.webapp.address"],"8088") - $rm_https_port = hdp_get_port_from_url($yarn-site["yarn.resourcemanager.webapp.https.address"],"8090") $nn_principal_str = hdp_default("hdfs-site/dfs.namenode.kerberos.principal", "nn/[email protected]") if ("_HOST" in $nn_principal_str and hdp_is_empty($namenode_host) == false) {
