Updated Branches: refs/heads/trunk cfdb9ce59 -> 8944c1db3
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/8944c1db Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/8944c1db Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/8944c1db Branch: refs/heads/trunk Commit: 8944c1db3da6a1eda6f9d7211c8be6cb73cf00d1 Parents: cfdb9ce Author: Lisnichenko Dmitro <[email protected]> Authored: Thu Nov 7 16:43:46 2013 +0200 Committer: Lisnichenko Dmitro <[email protected]> Committed: Thu Nov 7 16:43:46 2013 +0200 ---------------------------------------------------------------------- .../src/main/puppet/modules/hdp-yarn/manifests/params.pp | 7 +++++-- ambari-agent/src/main/puppet/modules/hdp/manifests/init.pp | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/8944c1db/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..da69693 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::rm_port + $rm_https_port = $hdp::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/8944c1db/ambari-agent/src/main/puppet/modules/hdp/manifests/init.pp ---------------------------------------------------------------------- diff --git a/ambari-agent/src/main/puppet/modules/hdp/manifests/init.pp b/ambari-agent/src/main/puppet/modules/hdp/manifests/init.pp index 99cf29b..2eaec7b 100644 --- a/ambari-agent/src/main/puppet/modules/hdp/manifests/init.pp +++ b/ambari-agent/src/main/puppet/modules/hdp/manifests/init.pp @@ -72,6 +72,7 @@ class hdp( if has_key($configuration, 'yarn-site') { $yarn-site = $configuration['yarn-site'] $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") $nm_port = hdp_get_port_from_url($yarn-site["yarn.nodemanager.webapp.address"],"8042") }
