You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2017/05/26 00:19:16 UTC

ambari git commit: AMBARI-21118. HDP + HDF cluster cannot save configs for Storm when Streamline is installed due to missing configs (alejandro)

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 e52264823 -> 75de63d35


AMBARI-21118. HDP + HDF cluster cannot save configs for Storm when Streamline is installed due to missing configs
 (alejandro)


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

Branch: refs/heads/branch-2.5
Commit: 75de63d35134626472eb5ca7adeccc8144712f18
Parents: e522648
Author: Alejandro Fernandez <af...@hortonworks.com>
Authored: Thu May 25 17:18:56 2017 -0700
Committer: Alejandro Fernandez <af...@hortonworks.com>
Committed: Thu May 25 17:18:56 2017 -0700

----------------------------------------------------------------------
 .../STORM/1.1.0/configuration/storm-site.xml    | 36 +++++++++++---------
 .../stacks/HDP/2.6/services/STORM/metainfo.xml  |  6 +++-
 2 files changed, 25 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/75de63d3/ambari-server/src/main/resources/common-services/STORM/1.1.0/configuration/storm-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/STORM/1.1.0/configuration/storm-site.xml b/ambari-server/src/main/resources/common-services/STORM/1.1.0/configuration/storm-site.xml
index 1a5dde9..b2e9acb 100644
--- a/ambari-server/src/main/resources/common-services/STORM/1.1.0/configuration/storm-site.xml
+++ b/ambari-server/src/main/resources/common-services/STORM/1.1.0/configuration/storm-site.xml
@@ -21,24 +21,28 @@
 -->
 <configuration supports_final="true">
   <property>
-    <name>nimbus.autocredential.plugins.classes</name>
+    <name>nimbus.impersonation.acl</name>
     <description>
-      Allows users to add token based authentication for services such as HDFS, HBase, Hive
-    </description>
-    <on-ambari-upgrade add="false"/>
-  </property>
-  <property>
-    <name>nimbus.credential.renewers.freq.secs</name>
-    <description>
-      Frequency at which tokens will be renewed.
-    </description>
-    <on-ambari-upgrade add="false"/>
-  </property>
-  <property>
-    <name>nimbus.credential.renewers.classes</name>
-    <description>
-      List of classes for token renewal
+      The ImpersonationAuthorizer uses nimbus.impersonation.acl as the acl to authorize users. Following is a sample nimbus config for supporting impersonation:
+      nimbus.impersonation.acl:
+      impersonating_user1:
+      hosts:
+      [comma separated list of hosts from which impersonating_user1 is allowed to impersonate other users]
+      groups:
+      [comma separated list of groups whose users impersonating_user1 is allowed to impersonate]
+      impersonating_user2:
+      hosts:
+      [comma separated list of hosts from which impersonating_user2 is allowed to impersonate other users]
+      groups:
+      [comma separated list of groups whose users impersonating_user2 is allowed to impersonate]
     </description>
+    <!-- The depends-on section is new in this version, required so Stack Advisor can include streamline-env and streamline-common configs. -->
+    <depends-on>
+      <property>
+        <type>streamline-env</type>
+        <name>streamline_principal_name</name>
+      </property>
+    </depends-on>
     <on-ambari-upgrade add="false"/>
   </property>
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/75de63d3/ambari-server/src/main/resources/stacks/HDP/2.6/services/STORM/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/services/STORM/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.6/services/STORM/metainfo.xml
index 49e00f7..747d951 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.6/services/STORM/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.6/services/STORM/metainfo.xml
@@ -23,9 +23,13 @@
       <name>STORM</name>
       <version>1.1.0</version>
       <extends>common-services/STORM/1.1.0</extends>
+
       <configuration-dependencies>
-        <config-type>application-properties</config-type>
+        <!-- From Streamline. -->
+        <config-type>streamline-env</config-type>
+        <config-type>streamline-common</config-type>
       </configuration-dependencies>
+
     </service>
   </services>
 </metainfo>