Repository: ambari
Updated Branches:
  refs/heads/trunk fa2fe9d8e -> 2fa50206f


AMBARI-15713. Starting MapR History Server Fails When NameNode is SSL (aonishuk)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2fa50206
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2fa50206
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2fa50206

Branch: refs/heads/trunk
Commit: 2fa50206fb3ae1c077ef03e6558b0782b05af4a3
Parents: fa2fe9d
Author: Andrew Onishuk <[email protected]>
Authored: Tue Apr 5 17:22:34 2016 +0300
Committer: Andrew Onishuk <[email protected]>
Committed: Tue Apr 5 17:22:34 2016 +0300

----------------------------------------------------------------------
 .../resource_management/libraries/functions/namenode_ha_utils.py   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/2fa50206/ambari-common/src/main/python/resource_management/libraries/functions/namenode_ha_utils.py
----------------------------------------------------------------------
diff --git 
a/ambari-common/src/main/python/resource_management/libraries/functions/namenode_ha_utils.py
 
b/ambari-common/src/main/python/resource_management/libraries/functions/namenode_ha_utils.py
index 36a34c1..b6f3bee 100644
--- 
a/ambari-common/src/main/python/resource_management/libraries/functions/namenode_ha_utils.py
+++ 
b/ambari-common/src/main/python/resource_management/libraries/functions/namenode_ha_utils.py
@@ -75,7 +75,7 @@ def get_namenode_states_noretries(hdfs_site, 
security_enabled, run_user):
   # ie dfs.namenode.http-address.hacluster.nn1
   nn_unique_ids = hdfs_site[nn_unique_ids_key].split(',')
   for nn_unique_id in nn_unique_ids:
-    is_https_enabled = hdfs_site['dfs.https.enable'] if not 
is_empty(hdfs_site['dfs.https.enable']) else False
+    is_https_enabled = is_empty(hdfs_site['dfs.http.policy']) and 
hdfs_site['dfs.http.policy'].upper() == "HTTPS_ONLY"
 
     rpc_key = NAMENODE_RPC_FRAGMENT.format(name_service,nn_unique_id)
     if not is_https_enabled:

Reply via email to