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 2015/03/20 19:24:00 UTC
ambari git commit: AMBARI-10157. Creating "false" local user
(alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/branch-2.0.0 5397621db -> 47b6ebfe3
AMBARI-10157. Creating "false" local user (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/47b6ebfe
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/47b6ebfe
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/47b6ebfe
Branch: refs/heads/branch-2.0.0
Commit: 47b6ebfe3299dd3f07b0a735abe59aba8452a3d5
Parents: 5397621
Author: Alex Antonenko <hi...@gmail.com>
Authored: Fri Mar 20 17:29:20 2015 +0200
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Fri Mar 20 20:23:10 2015 +0200
----------------------------------------------------------------------
.../main/java/org/apache/ambari/server/state/PropertyInfo.java | 3 ++-
.../resources/stacks/HDP/2.0.6/configuration/cluster-env.xml | 4 ++--
.../resources/stacks/HDPWIN/2.1/configuration/cluster-env.xml | 2 +-
ambari-web/app/utils/config.js | 2 +-
4 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/47b6ebfe/ambari-server/src/main/java/org/apache/ambari/server/state/PropertyInfo.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/PropertyInfo.java b/ambari-server/src/main/java/org/apache/ambari/server/state/PropertyInfo.java
index e26b48f..560570a 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/PropertyInfo.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/PropertyInfo.java
@@ -166,6 +166,7 @@ public class PropertyInfo {
public enum PropertyType {
PASSWORD,
USER,
- GROUP
+ GROUP,
+ ADDITIONAL_USER_PROPERTY
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/47b6ebfe/ambari-server/src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml
index 1bfc1ee..c16b069 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml
@@ -34,7 +34,7 @@
<property>
<name>ignore_groupsusers_create</name>
<value>false</value>
- <property-type>USER</property-type>
+ <property-type>ADDITIONAL_USER_PROPERTY</property-type>
<description>Whether to ignore failures on users and group creation</description>
</property>
<property>
@@ -54,4 +54,4 @@
<property-type>GROUP</property-type>
<description>Hadoop user group.</description>
</property>
-</configuration>
\ No newline at end of file
+</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/47b6ebfe/ambari-server/src/main/resources/stacks/HDPWIN/2.1/configuration/cluster-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/configuration/cluster-env.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/configuration/cluster-env.xml
index f014f8d..24294a4 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/configuration/cluster-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/configuration/cluster-env.xml
@@ -45,7 +45,7 @@
</property>
<property>
<name>ignore_groupsusers_create</name>
- <property-type>USER</property-type>
+ <property-type>ADDITIONAL_USER_PROPERTY</property-type>
<value>false</value>
<description>Whether to ignore failures on users and group creation</description>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/47b6ebfe/ambari-web/app/utils/config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js
index ed34232..93206c8 100644
--- a/ambari-web/app/utils/config.js
+++ b/ambari-web/app/utils/config.js
@@ -1000,7 +1000,7 @@ App.config = Em.Object.create({
'zk_user': 'ZooKeeper User',
'ignore_groupsusers_create': 'Skip group modifications during install'
};
- if (config.property_type.contains('USER') || config.property_type.contains('GROUP')) {
+ if (config.property_type.contains('USER') || config.property_type.contains('ADDITIONAL_USER_PROPERTY') || config.property_type.contains('GROUP')) {
propertyData.id = "puppet var";
propertyData.category = 'Users and Groups';
propertyData.isVisible = !App.get('isHadoopWindowsStack');