You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ja...@apache.org on 2015/10/31 01:02:01 UTC

ambari git commit: AMBARI-13669. Ranger External url is not updated when https flag is enabled. (jaimin)

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 43fc62bf6 -> 8a540c46b


AMBARI-13669. Ranger External url is not updated when https flag is enabled. (jaimin)


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

Branch: refs/heads/branch-2.1
Commit: 8a540c46bfbe6ac673ed69060816112805685f28
Parents: 43fc62b
Author: Jaimin Jetly <ja...@hortonworks.com>
Authored: Fri Oct 30 17:01:47 2015 -0700
Committer: Jaimin Jetly <ja...@hortonworks.com>
Committed: Fri Oct 30 17:01:47 2015 -0700

----------------------------------------------------------------------
 .../0.4.0/configuration/admin-properties.xml    | 14 ++++++++++++
 .../RANGER/configuration/admin-properties.xml   | 24 ++++++++++++++++++++
 2 files changed, 38 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/8a540c46/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/admin-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/admin-properties.xml b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/admin-properties.xml
index dd9a1b0..1ff4fd9 100644
--- a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/admin-properties.xml
+++ b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/admin-properties.xml
@@ -170,6 +170,20 @@
     <value-attributes>
       <overridable>false</overridable>
     </value-attributes>
+    <depends-on>
+      <property>
+        <type>ranger-site</type>
+        <name>http.enabled</name>
+      </property>
+      <property>
+        <type>ranger-site</type>
+        <name>http.service.port</name>
+      </property>
+      <property>
+        <type>ranger-site</type>
+        <name>https.service.port</name>
+      </property>
+    </depends-on>
   </property>
 
   <property>

http://git-wip-us.apache.org/repos/asf/ambari/blob/8a540c46/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/admin-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/admin-properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/admin-properties.xml
index 67be091..837b26e 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/admin-properties.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/admin-properties.xml
@@ -56,6 +56,30 @@
   </property>
 
   <property>
+    <name>policymgr_external_url</name>
+    <value></value>
+    <display-name>External URL</display-name>
+    <description>Policy Manager external url eg: http://RANGER_HOST:6080</description>
+    <value-attributes>
+      <overridable>false</overridable>
+    </value-attributes>
+    <depends-on>
+      <property>
+        <type>ranger-admin-site</type>
+        <name>ranger.service.http.enabled</name>
+      </property>
+      <property>
+        <type>ranger-admin-site</type>
+        <name>ranger.service.http.port</name>
+      </property>
+      <property>
+        <type>ranger-admin-site</type>
+        <name>ranger.service.https.port</name>
+      </property>
+    </depends-on>
+  </property>
+
+  <property>
     <name>db_root_user</name>
     <value>root</value>
     <display-name>Ranger DB root user</display-name>