You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ma...@apache.org on 2016/06/29 12:08:58 UTC
[2/2] ambari git commit: AMBARI-17403. Fix hostname in stack advisor
for proxy user properties (magyari_sandor)
AMBARI-17403. Fix hostname in stack advisor for proxy user properties (magyari_sandor)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7474ec4e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7474ec4e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7474ec4e
Branch: refs/heads/trunk
Commit: 7474ec4e9c9bbefeeb09f701380cd7093eff28c6
Parents: addc5d0
Author: Sandor Magyari <sm...@hortonworks.com>
Authored: Wed Jun 29 14:04:02 2016 +0200
Committer: Sandor Magyari <sm...@hortonworks.com>
Committed: Wed Jun 29 14:04:02 2016 +0200
----------------------------------------------------------------------
.../resources/stacks/HDP/2.0.6/services/stack_advisor.py | 8 ++++----
.../test/python/stacks/2.0.6/common/test_stack_advisor.py | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/7474ec4e/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
index 373403c..9a310b5 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
@@ -195,7 +195,7 @@ class HDP206StackAdvisor(DefaultStackAdvisor):
if oozieServerrHosts is not None:
oozieServerHostsNameList = []
for oozieServerHost in oozieServerrHosts:
- oozieServerHostsNameList.append(oozieServerHost["Hosts"]["public_host_name"])
+ oozieServerHostsNameList.append(oozieServerHost["Hosts"]["host_name"])
oozieServerHostsNames = ",".join(oozieServerHostsNameList)
if not oozie_user in users and oozie_user is not None:
users[oozie_user] = {"propertyHosts" : oozieServerHostsNames,"propertyGroups" : "*", "config" : "oozie-env", "propertyName" : "oozie_user"}
@@ -213,7 +213,7 @@ class HDP206StackAdvisor(DefaultStackAdvisor):
if hiveServerHosts is not None:
hiveServerHostsNameList = []
for hiveServerHost in hiveServerHosts:
- hiveServerHostsNameList.append(hiveServerHost["Hosts"]["public_host_name"])
+ hiveServerHostsNameList.append(hiveServerHost["Hosts"]["host_name"])
hiveServerHostsNames = ",".join(hiveServerHostsNameList)
if not hive_user in users and hive_user is not None:
users[hive_user] = {"propertyHosts" : hiveServerHostsNames,"propertyGroups" : "*", "config" : "hive-env", "propertyName" : "hive_user"}
@@ -221,7 +221,7 @@ class HDP206StackAdvisor(DefaultStackAdvisor):
if webHcatServerHosts is not None:
webHcatServerHostsNameList = []
for webHcatServerHost in webHcatServerHosts:
- webHcatServerHostsNameList.append(webHcatServerHost["Hosts"]["public_host_name"])
+ webHcatServerHostsNameList.append(webHcatServerHost["Hosts"]["host_name"])
webHcatServerHostsNames = ",".join(webHcatServerHostsNameList)
if not webhcat_user in users and webhcat_user is not None:
users[webhcat_user] = {"propertyHosts" : webHcatServerHostsNames,"propertyGroups" : "*", "config" : "hive-env", "propertyName" : "webhcat_user"}
@@ -235,7 +235,7 @@ class HDP206StackAdvisor(DefaultStackAdvisor):
if len(rmHosts) > 1:
rmHostsNameList = []
for rmHost in rmHosts:
- rmHostsNameList.append(rmHost["Hosts"]["public_host_name"])
+ rmHostsNameList.append(rmHost["Hosts"]["host_name"])
rmHostsNames = ",".join(rmHostsNameList)
if not yarn_user in users and yarn_user is not None:
users[yarn_user] = {"propertyHosts" : rmHostsNames, "config" : "yarn-env", "propertyName" : "yarn_user"}
http://git-wip-us.apache.org/repos/asf/ambari/blob/7474ec4e/ambari-server/src/test/python/stacks/2.0.6/common/test_stack_advisor.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/common/test_stack_advisor.py b/ambari-server/src/test/python/stacks/2.0.6/common/test_stack_advisor.py
index 6a8f3e2..7a092fc 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/common/test_stack_advisor.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/common/test_stack_advisor.py
@@ -979,7 +979,7 @@ class TestHDP206StackAdvisor(TestCase):
"os_arch": "x86_64",
"os_type": "centos6",
"ph_cpu_count": 1,
- "public_host_name": "c6401.ambari.apache.org",
+ "public_host_name": "public.c6401.ambari.apache.org",
"rack_info": "/default-rack",
"total_mem": 2097152,
"disk_info": [{
@@ -996,7 +996,7 @@ class TestHDP206StackAdvisor(TestCase):
"os_arch": "x86_64",
"os_type": "centos6",
"ph_cpu_count": 1,
- "public_host_name": "c6402.ambari.apache.org",
+ "public_host_name": "public.c6402.ambari.apache.org",
"rack_info": "/default-rack",
"total_mem": 1048576,
"disk_info": [{