ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smoha...@apache.org
Subject ambari git commit: Revert "AMBARI-21045. AMBARI-21045. Enable Storm's AutoTGT configs in secure mode (Sriharsha Chintalapani via smohanty)"
Date Tue, 15 Aug 2017 23:58:19 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 3d07ec5a0 -> 96e5ea566


Revert "AMBARI-21045. AMBARI-21045. Enable Storm's AutoTGT configs in secure mode (Sriharsha
Chintalapani via smohanty)"

This reverts commit 3d07ec5a091de3735e63c5500c380612e6533baa.


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

Branch: refs/heads/branch-2.5
Commit: 96e5ea566037e7874e815000966495145974f69c
Parents: 3d07ec5
Author: Sumit Mohanty <smohanty@hortonworks.com>
Authored: Tue Aug 15 16:58:05 2017 -0700
Committer: Sumit Mohanty <smohanty@hortonworks.com>
Committed: Tue Aug 15 16:58:05 2017 -0700

----------------------------------------------------------------------
 .../server/upgrade/UpgradeCatalog251.java       | 36 --------
 .../STORM/1.1.0/configuration/storm-env.xml     | 54 ------------
 .../STORM/1.1.0/configuration/storm-site.xml    | 48 +++++++++++
 .../stacks/HDP/2.3/upgrades/config-upgrade.xml  |  7 --
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml |  4 -
 .../stacks/HDP/2.3/upgrades/upgrade-2.6.xml     |  1 -
 .../stacks/HDP/2.4/upgrades/config-upgrade.xml  |  7 --
 .../HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml |  4 -
 .../stacks/HDP/2.4/upgrades/upgrade-2.6.xml     |  2 -
 .../stacks/HDP/2.5/upgrades/config-upgrade.xml  |  7 --
 .../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml |  4 -
 .../stacks/HDP/2.5/upgrades/upgrade-2.6.xml     |  1 -
 .../stacks/HDP/2.6/services/stack_advisor.py    | 87 +-------------------
 .../stacks/HDP/2.6/upgrades/config-upgrade.xml  |  6 --
 .../HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml |  4 -
 .../stacks/HDP/2.6/upgrades/upgrade-2.6.xml     |  1 -
 .../src/main/resources/stacks/stack_advisor.py  | 18 ----
 17 files changed, 51 insertions(+), 240 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/96e5ea56/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog251.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog251.java
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog251.java
index 1a854f8..afda1f6 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog251.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog251.java
@@ -170,40 +170,4 @@ public class UpgradeCatalog251 extends AbstractUpgradeCatalog {
       }
     }
   }
-
-  /**
-   * Make sure storm-env changes are applied to anyone upgrading to HDP-2.6.1 Storm
-   * If the base version was before Ambari 2.5.0, this method should wind up doing nothing.
-   * @throws AmbariException
-   */
-  protected void updateSTORMConfigs() throws AmbariException {
-    AmbariManagementController ambariManagementController = injector.getInstance(AmbariManagementController.class);
-    Clusters clusters = ambariManagementController.getClusters();
-    if (clusters != null) {
-      Map<String, Cluster> clusterMap = getCheckedClusterMap(clusters);
-      if (clusterMap != null && !clusterMap.isEmpty()) {
-        for (final Cluster cluster : clusterMap.values()) {
-          Set<String> installedServices = cluster.getServices().keySet();
-
-          if (installedServices.contains("STORM") && cluster.getSecurityType() ==
SecurityType.KERBEROS) {
-            Config stormEnv = cluster.getDesiredConfigByType(STORM_ENV_CONFIG);
-            String content = stormEnv.getProperties().get("content");
-            if (content != null && !content.contains("STORM_AUTOCREDS_LIB_DIR"))
{
-              Map<String, String> newProperties = new HashMap<>();
-              String stormEnvConfigs = "\n #set storm-auto creds \n" +
-                  "# check if storm_jaas.conf in config , only enable storm_auto_creds in
secure mode.\n " +
-                  "STORM_JAAS_CONF=$STORM_HOME/conf/storm_jaas.conf \n" +
-                  "STORM_AUTOCREDS_LIB_DIR=$STORM_HOME/external/storm-autocreds \n" +
-                  "if [ -f $STORM_JAAS_CONF ] &amp;&amp; [ -d $STORM_AUTOCREDS_LIB_DIR
]; then \n" +
-                  "   export STORM_EXT_CLASSPATH=$STORM_AUTOCREDS_LIB_DIR \n" +
-                  "fi\n";
-              content += stormEnvConfigs;
-              newProperties.put("content", content);
-              updateConfigurationPropertiesForCluster(cluster, "storm-env", newProperties,
true, false);
-            }
-          }
-        }
-      }
-    }
-  }
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/96e5ea56/ambari-server/src/main/resources/common-services/STORM/1.1.0/configuration/storm-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/STORM/1.1.0/configuration/storm-env.xml
b/ambari-server/src/main/resources/common-services/STORM/1.1.0/configuration/storm-env.xml
deleted file mode 100644
index 2ce560d..0000000
--- a/ambari-server/src/main/resources/common-services/STORM/1.1.0/configuration/storm-env.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-<!--
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-<configuration supports_adding_forbidden="true">
-  <!-- storm-env.sh -->
-  <property>
-    <name>content</name>
-    <display-name>storm-env template</display-name>
-    <description>This is the jinja template for storm-env.sh file</description>
-    <value>
-#!/bin/bash
-
-# Set Storm specific environment variables here.
-
-# The java implementation to use.
-export JAVA_HOME={{java64_home}}
-
-export STORM_CONF_DIR={{conf_dir}}
-export STORM_HOME={{storm_component_home_dir}}
-export STORM_JAR_JVM_OPTS={{jar_jvm_opts}}
-
-#set storm-auto creds
-# check if storm_jaas.conf in config , only enable storm_auto_creds in secure mode.
-STORM_JAAS_CONF=$STORM_HOME/conf/storm_jaas.conf
-STORM_AUTOCREDS_LIB_DIR=$STORM_HOME/external/storm-autocreds
-
-if [ -f $STORM_JAAS_CONF ] &amp;&amp; [ -d $STORM_AUTOCREDS_LIB_DIR ]; then
-    export STORM_EXT_CLASSPATH=$STORM_AUTOCREDS_LIB_DIR
-fi
-    </value>
-    <value-attributes>
-      <type>content</type>
-    </value-attributes>
-    <on-ambari-upgrade add="true"/>
-  </property>
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/96e5ea56/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
new file mode 100644
index 0000000..b2e9acb
--- /dev/null
+++ b/ambari-server/src/main/resources/common-services/STORM/1.1.0/configuration/storm-site.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+<!--
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+<configuration supports_final="true">
+  <property>
+    <name>nimbus.impersonation.acl</name>
+    <description>
+      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/96e5ea56/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml
index 0c4106e..d8e2d7d 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml
@@ -664,13 +664,6 @@
                      replace-with="${sys:workers.artifacts}/${sys:storm.id}/${sys:worker.port}/${sys:logfile.name}"/>
           </definition>
 
-          <definition xsi:type="configure" id="storm_nimbus_autocred_config" summary="Update
Storm's Nimbus AutoCred config">
-            <type>storm-site</type>
-            <set key="nimbus.autocredential.plugins.classes" value="['org.apache.storm.hdfs.security.AutoHDFS',
'org.apache.storm.hbase.security.AutoHBase', 'org.apache.storm.hive.security.AutoHive']" if-type="streamline-common"
if-key="authorizer.class.name" if-key-state="present"/>
-            <set key="nimbus.credential.renewers.classes" value="['org.apache.storm.hdfs.security.AutoHDFS',
'org.apache.storm.hbase.security.AutoHBase', 'org.apache.storm.hive.security.AutoHive']" if-type="streamline-common"
if-key="authorizer.class.name" if-key-state="present"/>
-            <set key="nimbus.credential.renewers.freq.secs" value="82800" if-type="streamline-common"
if-key="authorizer.class.name" if-key-state="present"/>
-          </definition>
-
         </changes>
       </component>
     </service>

http://git-wip-us.apache.org/repos/asf/ambari/blob/96e5ea56/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml
b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml
index c45c7c5..ca3c193 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml
@@ -638,10 +638,6 @@
         <task xsi:type="configure" id="hdp_2_5_0_0_upgrade_storm_1.0"/>
       </execute-stage>
 
-      <execute-stage service="STORM" component="NIMBUS" title="Apply config changes for
Storm AutoCreds">
-        <task xsi:type="configure" id="storm_nimbus_autocred_config"/>
-      </execute-stage>
-
       <execute-stage service="STORM" component="NIMBUS" title="Apply config changes for
Storm">
         <!-- Remove Atlas configs that were incorrectly added to storm-site instead of
Atlas' application.properties. -->
         <task xsi:type="configure" id="hdp_2_5_0_0_remove_storm_atlas_configs"/>

http://git-wip-us.apache.org/repos/asf/ambari/blob/96e5ea56/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml
index 69be4dc..cf2c257 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml
@@ -1130,7 +1130,6 @@
           <task xsi:type="configure" id="storm_worker_log4j_parameterize" />
           <task xsi:type="configure" id="storm_cluster_log4j_parameterize" />
           <task xsi:type="configure" id="storm_worker_log4j_directory" />
-          <task xsi:type="configure" id="storm_nimbus_autocred_config" />
         </pre-upgrade>
 
         <pre-downgrade>

http://git-wip-us.apache.org/repos/asf/ambari/blob/96e5ea56/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml
index 3e62fb1..83a0a1e 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml
@@ -483,13 +483,6 @@
             <replace key="content" find="${sys:storm.log.dir}/${sys:logfile.name}"
                      replace-with="${sys:workers.artifacts}/${sys:storm.id}/${sys:worker.port}/${sys:logfile.name}"/>
           </definition>
-          <definition xsi:type="configure" id="storm_nimbus_autocred_config" summary="Update
Storm's Nimbus AutoCred config">
-            <type>storm-site</type>
-            <set key="nimbus.autocredential.plugins.classes" value="['org.apache.storm.hdfs.security.AutoHDFS',
'org.apache.storm.hbase.security.AutoHBase', 'org.apache.storm.hive.security.AutoHive']" if-type="streamline-common"
if-key="authorizer.class.name" if-key-state="present"/>
-            <set key="nimbus.credential.renewers.classes" value="['org.apache.storm.hdfs.security.AutoHDFS',
'org.apache.storm.hbase.security.AutoHBase', 'org.apache.storm.hive.security.AutoHive']" if-type="streamline-common"
if-key="authorizer.class.name" if-key-state="present"/>
-            <set key="nimbus.credential.renewers.freq.secs" value="82800" if-type="streamline-common"
if-key="authorizer.class.name" if-key-state="present"/>
-          </definition>
-
         </changes>
       </component>
     </service>

http://git-wip-us.apache.org/repos/asf/ambari/blob/96e5ea56/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml
b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml
index b6f48fc..6e899ee 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml
@@ -563,10 +563,6 @@
         <task xsi:type="configure" id="hdp_2_5_0_0_remove_storm_atlas_configs"/>
       </execute-stage>
 
-      <execute-stage service="STORM" component="NIMBUS" title="Apply config changes for
Storm AutoCreds">
-        <task xsi:type="configure" id="storm_nimbus_autocred_config"/>
-      </execute-stage>
-
       <execute-stage service="STORM" component="NIMBUS" title="Apply security changes
for Storm">
         <!-- Add nimbus.impersonation acls . -->
         <task xsi:type="configure" id="hdp_2_5_0_0_add_storm_security_configs" />

http://git-wip-us.apache.org/repos/asf/ambari/blob/96e5ea56/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml
index f1d34e7..4e14e83 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml
@@ -1092,8 +1092,6 @@
           <task xsi:type="configure" id="storm_worker_log4j_parameterize" />
           <task xsi:type="configure" id="storm_cluster_log4j_parameterize" />
           <task xsi:type="configure" id="storm_worker_log4j_directory" />
-          <task xsi:type="configure" id="storm_nimbus_autocred_config" />
-          
         </pre-upgrade>
 
         <pre-downgrade>

http://git-wip-us.apache.org/repos/asf/ambari/blob/96e5ea56/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
index 8539006..f227bac 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
@@ -63,13 +63,6 @@
             <regex-replace key="content" find="A1&quot; immediateFlush=&quot;false&quot;&#xA;
                fileName=&quot;\$\{sys:storm.log.dir}/\$\{sys:logfile.name}&quot;&#xA;
                filePattern=&quot;\$\{sys:storm.log.dir}/\$\{sys:logfile.name}.%i.gz&quot;&gt;&#xA;
       &lt;PatternLayout&gt;&#xA;            &lt;pattern&gt;\$\{pattern}&lt;/pattern&gt;&#xA;
       &lt;/PatternLayout&gt;&#xA;        &lt;Policies&gt;&#xA;  
         &lt;SizeBasedTriggeringPolicy size=&quot;(?:[0-9]+) MB&quot;/&gt;
&lt;!-- Or every 100 MB --&gt;&#xA;        &lt;/Policies&gt;&#xA;
       &lt;DefaultRolloverStrategy max=&quot;([0-9]+)"
                                          replace-with="A1&quot; immediateFlush=&quot;false&quot;&#xA;
                fileName=&quot;${sys:storm.log.dir}/${sys:logfile.name}&quot;&#xA;
                filePattern=&quot;${sys:storm.log.dir}/${sys:logfile.name}.%i.gz&quot;&gt;&#xA;
       &lt;PatternLayout&gt;&#xA;            &lt;pattern&gt;${pattern}&lt;/pattern&gt;&#xA;
       &lt;/PatternLayout&gt;&#xA;        &lt;Policies&gt;&#xA;  
         &lt;SizeBasedTriggeringPolicy size=&quot;{{storm_a1_maxfilesize}} MB&quot;/&gt;
&lt;!-- Or every 100 MB --&gt;&#xA;        &lt;/Policies&gt;&#xA;
       &lt;DefaultRolloverStrategy max=&quot;{{storm_a1_maxbackupindex}}"/>
           </definition>
-          <definition xsi:type="configure" id="storm_nimbus_autocred_config" summary="Update
Storm's Nimbus AutoCred config">
-            <type>storm-site</type>
-            <set key="nimbus.autocredential.plugins.classes" value="['org.apache.storm.hdfs.security.AutoHDFS',
'org.apache.storm.hbase.security.AutoHBase', 'org.apache.storm.hive.security.AutoHive']" if-type="streamline-common"
if-key="authorizer.class.name" if-key-state="present"/>
-            <set key="nimbus.credential.renewers.classes" value="['org.apache.storm.hdfs.security.AutoHDFS',
'org.apache.storm.hbase.security.AutoHBase', 'org.apache.storm.hive.security.AutoHive']" if-type="streamline-common"
if-key="authorizer.class.name" if-key-state="present"/>
-            <set key="nimbus.credential.renewers.freq.secs" value="82800" if-type="streamline-common"
if-key="authorizer.class.name" if-key-state="present"/>
-          </definition>
-
         </changes>
       </component>
     </service>

http://git-wip-us.apache.org/repos/asf/ambari/blob/96e5ea56/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
index ef4c6f4..ce10e8b 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
@@ -416,10 +416,6 @@
         <task xsi:type="configure" id="hdp_2_6_0_0_remove_bind_anonymous"/>
       </execute-stage>
 
-      <execute-stage service="STORM" component="NIMBUS" title="Apply config changes for
Storm AutoCreds">
-        <task xsi:type="configure" id="storm_nimbus_autocred_config"/>
-      </execute-stage>
-
       <!--RANGER-->
       <execute-stage service="RANGER" component="RANGER_ADMIN" title="Parameterizing Ranger
Admin Log4J Properties">
         <task xsi:type="configure" id="admin_log4j_parameterize">

http://git-wip-us.apache.org/repos/asf/ambari/blob/96e5ea56/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml
index d9675f1..840b17d 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml
@@ -1030,7 +1030,6 @@
         <pre-upgrade>
           <task xsi:type="configure" id="storm_worker_log4j_parameterize" />
           <task xsi:type="configure" id="storm_cluster_log4j_parameterize" />
-          <task xsi:type="configure" id="storm_nimbus_autocred_config" />
         </pre-upgrade>
         <pre-downgrade/>
         <upgrade>

http://git-wip-us.apache.org/repos/asf/ambari/blob/96e5ea56/ambari-server/src/main/resources/stacks/HDP/2.6/services/stack_advisor.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/services/stack_advisor.py b/ambari-server/src/main/resources/stacks/HDP/2.6/services/stack_advisor.py
index 974b10c..cc5fa92 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.6/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.6/services/stack_advisor.py
@@ -41,92 +41,11 @@ class HDP26StackAdvisor(HDP25StackAdvisor):
         "HIVE": self.recommendHIVEConfigurations,
         "HBASE": self.recommendHBASEConfigurations,
         "YARN": self.recommendYARNConfigurations,
-        "KAFKA": self.recommendKAFKAConfigurations,
-        "BEACON": self.recommendBEACONConfigurations,
-        "STORM": self.recommendSTORMConfigurations
+        "KAFKA": self.recommendKAFKAConfigurations
       }
       parentRecommendConfDict.update(childRecommendConfDict)
       return parentRecommendConfDict
 
-  def recommendSTORMConfigurations(self, configurations, clusterData, services, hosts):
-    """
-    In HDF-2.6.1 we introduced a new way of doing Auto Credentials with services such as
-    HDFS, HIVE, HBASE. This method will update the required configs for autocreds if the
users installs
-    STREAMLINE service.
-    """
-    super(HDP26StackAdvisor, self).recommendStormConfigurations(configurations, clusterData,
services, hosts)
-    storm_site = self.getServicesSiteProperties(services, "storm-site")
-    storm_env = self.getServicesSiteProperties(services, "storm-env")
-    putStormSiteProperty = self.putProperty(configurations, "storm-site", services)
-    putStormSiteAttributes = self.putPropertyAttribute(configurations, "storm-site")
-    security_enabled = self.isSecurityEnabled(services)
-    servicesList = [service["StackServices"]["service_name"] for service in services["services"]]
-
-    if storm_env and storm_site and security_enabled and 'STREAMLINE' in servicesList:
-      storm_nimbus_impersonation_acl = storm_site["nimbus.impersonation.acl"] if "nimbus.impersonation.acl"
in storm_site else None
-      streamline_env = self.getServicesSiteProperties(services, "streamline-env")
-      _streamline_principal_name = streamline_env['streamline_principal_name'] if 'streamline_principal_name'
in streamline_env else None
-      if _streamline_principal_name is not None and storm_nimbus_impersonation_acl is not
None:
-        streamline_bare_principal = get_bare_principal(_streamline_principal_name)
-        storm_nimbus_impersonation_acl.replace('{{streamline_bare_principal}}', streamline_bare_principal)
-        putStormSiteProperty('nimbus.impersonation.acl', storm_nimbus_impersonation_acl)
-      
-      storm_nimbus_autocred_plugin_classes = storm_site["nimbus.autocredential.plugins.classes"]
if "nimbus.autocredential.plugins.classes" in storm_site else None
-      if storm_nimbus_autocred_plugin_classes is not None:
-        new_storm_nimbus_autocred_plugin_classes = ['org.apache.storm.hdfs.security.AutoHDFS',
-                                                    'org.apache.storm.hbase.security.AutoHBase',
-                                                    'org.apache.storm.hive.security.AutoHive']
-        new_conf = DefaultStackAdvisor.appendToYamlString(storm_nimbus_autocred_plugin_classes,
-                                      new_storm_nimbus_autocred_plugin_classes)
-
-        putStormSiteProperty("nimbus.autocredential.plugins.classes", new_conf)
-      else:
-        putStormSiteProperty("nimbus.autocredential.plugins.classes", "['org.apache.storm.hdfs.security.AutoHDFS',
'org.apache.storm.hbase.security.AutoHBase', 'org.apache.storm.hive.security.AutoHive']")
-
-
-      storm_nimbus_credential_renewer_classes = storm_site["nimbus.credential.renewers.classes"]
if "nimbus.credential.renewers.classes" in storm_site else None
-      if storm_nimbus_credential_renewer_classes is not None:
-        new_storm_nimbus_credential_renewer_classes_array = ['org.apache.storm.hdfs.security.AutoHDFS',
-                                                             'org.apache.storm.hbase.security.AutoHBase',
-                                                             'org.apache.storm.hive.security.AutoHive']
-        new_conf = DefaultStackAdvisor.appendToYamlString(storm_nimbus_credential_renewer_classes,
-                                      new_storm_nimbus_credential_renewer_classes_array)
-        putStormSiteProperty("nimbus.autocredential.plugins.classes", new_conf)
-      else:
-        putStormSiteProperty("nimbus.credential.renewers.classes", "['org.apache.storm.hdfs.security.AutoHDFS',
'org.apache.storm.hbase.security.AutoHBase', 'org.apache.storm.hive.security.AutoHive']")
-      putStormSiteProperty("nimbus.credential.renewers.freq.secs", "82800")
-    pass  
-      
-  def recommendBEACONConfigurations(self, configurations, clusterData, services, hosts):
-    beaconEnvProperties = self.getSiteProperties(services['configurations'], 'beacon-env')
-    putbeaconEnvProperty = self.putProperty(configurations, "beacon-env", services)
-
-    # database URL and driver class recommendations
-    if beaconEnvProperties and self.checkSiteProperties(beaconEnvProperties, 'beacon_store_driver')
and self.checkSiteProperties(beaconEnvProperties, 'beacon_database'):
-      putbeaconEnvProperty('beacon_store_driver', self.getDBDriver(beaconEnvProperties['beacon_database']))
-    if beaconEnvProperties and self.checkSiteProperties(beaconEnvProperties, 'beacon_store_db_name',
'beacon_store_url') and self.checkSiteProperties(beaconEnvProperties, 'beacon_database'):
-      beaconServerHost = self.getHostWithComponent('BEACON', 'BEACON_SERVER', services, hosts)
-      beaconDBConnectionURL = beaconEnvProperties['beacon_store_url']
-      protocol = self.getProtocol(beaconEnvProperties['beacon_database'])
-      oldSchemaName = getOldValue(self, services, "beacon-env", "beacon_store_db_name")
-      oldDBType = getOldValue(self, services, "beacon-env", "beacon_database")
-      # under these if constructions we are checking if beacon server hostname available,
-      # if it's default db connection url with "localhost" or if schema name was changed
or if db type was changed (only for db type change from default mysql to existing mysql)
-      # or if protocol according to current db type differs with protocol in db connection
url(other db types changes)
-      if beaconServerHost is not None:
-        if (beaconDBConnectionURL and "//localhost" in beaconDBConnectionURL) or oldSchemaName
or oldDBType or (protocol and beaconDBConnectionURL and not beaconDBConnectionURL.startswith(protocol)):
-          dbConnection = self.getDBConnectionStringBeacon(beaconEnvProperties['beacon_database']).format(beaconServerHost['Hosts']['host_name'],
beaconEnvProperties['beacon_store_db_name'])
-          putbeaconEnvProperty('beacon_store_url', dbConnection)
-
-  def getDBConnectionStringBeacon(self, databaseType):
-    driverDict = {
-      'NEW DERBY DATABASE': 'jdbc:derby:${{beacon.data.dir}}/${{beacon.store.db.name}}-db;create=true',
-      'EXISTING MYSQL DATABASE': 'jdbc:mysql://{0}/{1}',
-      'EXISTING MYSQL / MARIADB DATABASE': 'jdbc:mysql://{0}/{1}',
-      'EXISTING ORACLE DATABASE': 'jdbc:oracle:thin:@//{0}:1521/{1}'
-    }
-    return driverDict.get(databaseType.upper())
-
   def recommendAtlasConfigurations(self, configurations, clusterData, services, hosts):
     super(HDP26StackAdvisor, self).recommendAtlasConfigurations(configurations, clusterData,
services, hosts)
     servicesList = [service["StackServices"]["service_name"] for service in services["services"]]
@@ -482,9 +401,9 @@ class HDP26StackAdvisor(HDP25StackAdvisor):
          propertyValue = "https://"+webapp_address+"/ws/v1/applicationhistory"
       Logger.info("validateYarnSiteConfigurations: recommended value for webservice url"+services["configurations"]["yarn-site"]["properties"]["yarn.log.server.web-service.url"])
       if services["configurations"]["yarn-site"]["properties"]["yarn.log.server.web-service.url"]
!= propertyValue:
-         validationItems = [
+         validationItems.append(
               {"config-name": "yarn.log.server.web-service.url",
-               "item": self.getWarnItem("Value should be %s" % propertyValue)}]
+               "item": self.getWarnItem("Value should be %s" % propertyValue)})
       return self.toConfigurationValidationProblems(validationItems, "yarn-site")
 
   def validateDruidHistoricalConfigurations(self, properties, recommendedDefaults, configurations,
services, hosts):

http://git-wip-us.apache.org/repos/asf/ambari/blob/96e5ea56/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml
index 3881137..c2c1532 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml
@@ -111,12 +111,6 @@
             <set key="ranger.plugin.storm.ambari.cluster.name" value="{{cluster_name}}"
               if-type="ranger-storm-plugin-properties" if-key="ranger-storm-plugin-enabled"
if-key-state="present"/>
           </definition>
-          <definition xsi:type="configure" id="storm_nimbus_autocred_config" summary="Update
Storm's Nimbus AutoCred config">
-            <type>storm-site</type>
-            <set key="nimbus.autocredential.plugins.classes" value="['org.apache.storm.hdfs.security.AutoHDFS',
'org.apache.storm.hbase.security.AutoHBase', 'org.apache.storm.hive.security.AutoHive']" if-type="streamline-common"
if-key="authorizer.class.name" if-key-state="present"/>
-            <set key="nimbus.credential.renewers.classes" value="['org.apache.storm.hdfs.security.AutoHDFS',
'org.apache.storm.hbase.security.AutoHBase', 'org.apache.storm.hive.security.AutoHive']" if-type="streamline-common"
if-key="authorizer.class.name" if-key-state="present"/>
-            <set key="nimbus.credential.renewers.freq.secs" value="82800" if-type="streamline-common"
if-key="authorizer.class.name" if-key-state="present"/>
-          </definition>
         </changes>
       </component>
     </service>

http://git-wip-us.apache.org/repos/asf/ambari/blob/96e5ea56/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml
b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml
index 6d8821b..df609cd 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml
@@ -328,10 +328,6 @@
         <task xsi:type="configure" id="hdp_2_6_maint_ranger_storm_plugin_cluster_name"/>
       </execute-stage>
 
-      <execute-stage service="STORM" component="NIMBUS" title="Apply config changes for
Storm AutoCreds">
-        <task xsi:type="configure" id="storm_nimbus_autocred_config"/>
-      </execute-stage>
-
       <!-- YARN -->
       <execute-stage service="YARN" component="RESOURCEMANAGER" title="Apply config changes
for Ranger Yarn plugin">
         <task xsi:type="configure" id="hdp_2_6_maint_ranger_yarn_plugin_cluster_name"/>

http://git-wip-us.apache.org/repos/asf/ambari/blob/96e5ea56/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml
index 07f0960..b376fa7 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml
@@ -965,7 +965,6 @@
       <component name="NIMBUS">
         <pre-upgrade>
           <task xsi:type="configure" id="hdp_2_6_maint_ranger_storm_plugin_cluster_name"/>
-          <task xsi:type="configure" id="storm_nimbus_autocred_config"/>
         </pre-upgrade>
         <pre-downgrade/> <!--  no-op to prevent config changes on downgrade -->
         <upgrade>

http://git-wip-us.apache.org/repos/asf/ambari/blob/96e5ea56/ambari-server/src/main/resources/stacks/stack_advisor.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/stack_advisor.py b/ambari-server/src/main/resources/stacks/stack_advisor.py
index 8ccbaba..ccbb676 100644
--- a/ambari-server/src/main/resources/stacks/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/stack_advisor.py
@@ -1375,21 +1375,3 @@ class DefaultStackAdvisor(StackAdvisor):
 
       if recommendation:
         put_f(name, ",".join(recommendation))
-        
-  @classmethod
-  def appendToYamlString(cls, yaml_string, list_classes):
-    updated_yaml_string = ""
-    try:
-      strip_yaml_str = re.sub('[\[\]\']', ' ', yaml_string)
-      klass_array = [x.strip() for x in strip_yaml_str.split(',')]
-      if yaml_string:
-        for klass in list_classes:
-          klass = klass.strip()
-          klass_array.append(klass)
-          klass_set = set(klass_array)
-          klass_list = [("'" + e + "'") for e in klass_set]
-          updated_yaml_string = "[" + ",".join(klass_list) + "]"
-    except Exception:
-      klass_list = [("'" + e + "'") for e in list_classes]
-      updated_yaml_string = "[" + ",".join(klass_list) + "]"
-    return updated_yaml_string


Mime
View raw message