You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by mu...@apache.org on 2016/12/22 05:04:40 UTC
ambari git commit: AMBARI-19228 : Knox doesn't redirect to Atlas
after entering correct credentials. (Vishal Suvagia via mugdha)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 f652f61e7 -> fa4dab96d
AMBARI-19228 : Knox doesn't redirect to Atlas after entering correct credentials. (Vishal Suvagia via mugdha)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fa4dab96
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fa4dab96
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fa4dab96
Branch: refs/heads/branch-2.5
Commit: fa4dab96db0e7dab7f6d46dab5a91b53cd69a0ca
Parents: f652f61
Author: Vishal Suvagia <vi...@yahoo.com>
Authored: Sat Dec 17 02:29:07 2016 +0530
Committer: Mugdha Varadkar <mu...@apache.org>
Committed: Thu Dec 22 10:33:42 2016 +0530
----------------------------------------------------------------------
.../common-services/ATLAS/0.1.0.2.3/package/scripts/params.py | 6 ++++++
.../services/ATLAS/configuration/application-properties.xml | 3 ++-
.../stacks/HDP/2.6/services/ATLAS/themes/theme_version_2.json | 2 +-
3 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/fa4dab96/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py
index 3d33a49..2ce480c 100644
--- a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py
@@ -138,6 +138,12 @@ metadata_server_host = atlas_hosts[0] if len(atlas_hosts) > 0 else "UNKNOWN_HOST
application_properties = dict(config['configurations']['application-properties'])
application_properties["atlas.server.bind.address"] = metadata_host
+# trimming knox_key
+if 'atlas.sso.knox.publicKey' in application_properties:
+ knox_key = application_properties['atlas.sso.knox.publicKey']
+ knox_key_without_new_line = knox_key.replace("\n","")
+ application_properties['atlas.sso.knox.publicKey'] = knox_key_without_new_line
+
if check_stack_feature(StackFeature.ATLAS_UPGRADE_SUPPORT, version_for_stack_feature_checks):
metadata_server_url = application_properties["atlas.rest.address"]
else:
http://git-wip-us.apache.org/repos/asf/ambari/blob/fa4dab96/ambari-server/src/main/resources/stacks/HDP/2.6/services/ATLAS/configuration/application-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/services/ATLAS/configuration/application-properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.6/services/ATLAS/configuration/application-properties.xml
index 0d6ee38..47e1fb5 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.6/services/ATLAS/configuration/application-properties.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.6/services/ATLAS/configuration/application-properties.xml
@@ -54,6 +54,7 @@
<value/>
<description/>
<value-attributes>
+ <type>multiline</type>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
<on-ambari-upgrade add="true"/>
@@ -92,4 +93,4 @@
<on-ambari-upgrade add="true"/>
</property>
-</configuration>
\ No newline at end of file
+</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/fa4dab96/ambari-server/src/main/resources/stacks/HDP/2.6/services/ATLAS/themes/theme_version_2.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/services/ATLAS/themes/theme_version_2.json b/ambari-server/src/main/resources/stacks/HDP/2.6/services/ATLAS/themes/theme_version_2.json
index a5435e9..74d0b4e 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.6/services/ATLAS/themes/theme_version_2.json
+++ b/ambari-server/src/main/resources/stacks/HDP/2.6/services/ATLAS/themes/theme_version_2.json
@@ -831,7 +831,7 @@
{
"config": "application-properties/atlas.sso.knox.publicKey",
"widget": {
- "type": "text-field"
+ "type": "text-area"
}
},
{