git commit: AMBARI-3696. Smoke test for YARN uses the hostname in yarn.resourcemanager.webapp.address for smoke tests. (Artem Baranchuk via dlysnichenko)

[dm...@apache.org]

Updated Branches:
  refs/heads/trunk 9d55ab937 -> f2c9e1a9a


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/f2c9e1a9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/f2c9e1a9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/f2c9e1a9

Branch: refs/heads/trunk
Commit: f2c9e1a9a4b2346e8e272566a4f52157081227ea
Parents: 9d55ab9
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Tue Nov 5 23:23:34 2013 +0200
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Tue Nov 5 23:23:34 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, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/f2c9e1a9/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 637b515..a5ca430 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,6 +29,9 @@ 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
@@ -41,8 +44,8 @@ class hdp-yarn::params(
   $yarn_pid_dir_prefix = hdp_default("yarn_pid_dir_prefix","/var/run/hadoop-yarn")
   
   ## yarn-site
-  $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")
+  $rm_webui_address = "${rm_host}:${rm_port}"
+  $rm_webui_https_address = "${rm_host}:${rm_https_port}"
   $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/f2c9e1a9/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 c86b6e9..95feb3c 100644
--- a/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp
+++ b/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp
@@ -88,6 +88,8 @@ 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/_HOST@EXAMPLE.COM")
   if ("_HOST" in $nn_principal_str and hdp_is_empty($namenode_host) == false) {