ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rle...@apache.org
Subject ambari git commit: AMBARI-11780. Ambari creation of oozie/conf/adminusers.txt breaks oozie role seperation for Kerberos (rlevas)
Date Mon, 22 Jun 2015 19:39:23 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 7f1fd18fb -> 1d6bec825


AMBARI-11780. Ambari creation of oozie/conf/adminusers.txt breaks oozie role seperation for
Kerberos (rlevas)


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

Branch: refs/heads/branch-2.1
Commit: 1d6bec825c531f6793b43fe9571c0b6a499eddd4
Parents: 7f1fd18
Author: Robert Levas <rlevas@hortonworks.com>
Authored: Mon Jun 22 15:39:11 2015 -0400
Committer: Robert Levas <rlevas@hortonworks.com>
Committed: Mon Jun 22 15:39:16 2015 -0400

----------------------------------------------------------------------
 .../OOZIE/4.0.0.2.0/configuration/oozie-env.xml |   5 +
 .../OOZIE/4.0.0.2.0/package/scripts/oozie.py    |   2 +-
 .../4.0.0.2.0/package/scripts/params_linux.py   |   1 +
 .../package/templates/adminusers.txt.j2         |   6 +-
 .../python/stacks/2.0.6/configs/default.json    |   3 +-
 .../2.0.6/configs/default_oozie_mysql.json      |   5 +-
 .../python/stacks/2.0.6/configs/secured.json    |   5 +-
 .../stacks/2.2/configs/oozie-downgrade.json     |   5 +-
 .../stacks/2.2/configs/oozie-upgrade.json       |   5 +-
 pom.xml                                         | 132 -------------------
 10 files changed, 26 insertions(+), 143 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6bec82/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-env.xml
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-env.xml
index 6439bc6..d582581 100644
--- a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-env.xml
+++ b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-env.xml
@@ -28,6 +28,11 @@
     <description>Oozie User.</description>
   </property>
   <property>
+    <name>oozie_admin_users</name>
+    <value>{oozie_user}, oozie-admin</value>
+    <description>Oozie admin users.</description>
+  </property>
+  <property>
     <name>oozie_database</name>
     <value>New Derby Database</value>
     <description>Oozie Server Database.</description>

http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6bec82/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
index 83b5715..53ed9e9 100644
--- a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
+++ b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
@@ -130,7 +130,7 @@ def oozie(is_server=False):
       mode=0644,
       group=params.user_group,
       owner=params.oozie_user,
-      content=Template('adminusers.txt.j2', oozie_user=params.oozie_user)
+      content=Template('adminusers.txt.j2', oozie_admin_users=params.oozie_admin_users)
     )
   else:
     File ( format("{params.conf_dir}/adminusers.txt"),

http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6bec82/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
index e5c3367..6cc51f1 100644
--- a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
+++ b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
@@ -94,6 +94,7 @@ execute_path = oozie_bin_dir + os.pathsep + hadoop_bin_dir
 oozie_user = config['configurations']['oozie-env']['oozie_user']
 smokeuser = config['configurations']['cluster-env']['smokeuser']
 smokeuser_principal = config['configurations']['cluster-env']['smokeuser_principal_name']
+oozie_admin_users = format(config['configurations']['oozie-env']['oozie_admin_users'])
 user_group = config['configurations']['cluster-env']['user_group']
 jdk_location = config['hostLevelParams']['jdk_location']
 check_db_connection_jar_name = "DBConnectionVerification.jar"

http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6bec82/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/templates/adminusers.txt.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/templates/adminusers.txt.j2
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/templates/adminusers.txt.j2
index 9feae39..2a0f7b2 100644
--- a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/templates/adminusers.txt.j2
+++ b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/templates/adminusers.txt.j2
@@ -21,4 +21,8 @@
 #     One user name per line
 #     Empty lines and lines starting with '#' are ignored
 
-{{oozie_user}}
\ No newline at end of file
+{% if oozie_admin_users %}
+{% for oozie_admin_user in oozie_admin_users.split(',') %}
+{{oozie_admin_user|trim}}
+{% endfor %}
+{% endif %}

http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6bec82/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
index b40c44a..2f31040 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
@@ -614,7 +614,8 @@
             "oozie_pid_dir": "/var/run/oozie", 
             "content": "\n#!/bin/bash\n\nif [ -d \"/usr/lib/bigtop-tomcat\" ]; then\n  export
OOZIE_CONFIG=${OOZIE_CONFIG:-/etc/oozie/conf}\n  export CATALINA_BASE=${CATALINA_BASE:-/var/lib/oozie/oozie-server}\n
 export CATALINA_TMPDIR=${CATALINA_TMPDIR:-/var/tmp/oozie}\n  export OOZIE_CATALINA_HOME=/usr/lib/bigtop-tomcat\nfi\n\n#Set
JAVA HOME\nexport JAVA_HOME={{java_home}}\n\nexport JRE_HOME=${JAVA_HOME}\n\n# Set Oozie specific
environment variables here.\n\n# Settings for the Embedded Tomcat that runs Oozie\n# Java
System properties for Oozie should be specified in this variable\n#\n# export CATALINA_OPTS=\n\n#
Oozie configuration file to load from Oozie configuration directory\n#\n# export OOZIE_CONFIG_FILE=oozie-site.xml\n\n#
Oozie logs directory\n#\nexport OOZIE_LOG={{oozie_log_dir}}\n\n# Oozie pid directory\n#\nexport
CATALINA_PID={{pid_file}}\n\n#Location of the data for oozie\nexport OOZIE_DATA={{oozie_data_dir}}\n\n#
Oozie Log4J configuration file to load from Oozie config
 uration directory\n#\n# export OOZIE_LOG4J_FILE=oozie-log4j.properties\n\n# Reload interval
of the Log4J configuration file, in seconds\n#\n# export OOZIE_LOG4J_RELOAD=10\n\n# The port
Oozie server runs\n#\nexport OOZIE_HTTP_PORT={{oozie_server_port}}\n\n# The admin port Oozie
server runs\n#\nexport OOZIE_ADMIN_PORT={{oozie_server_admin_port}}\n\n# The host name Oozie
server runs on\n#\n# export OOZIE_HTTP_HOSTNAME=`hostname -f`\n\n# The base URL for callback
URLs to Oozie\n#\n# export OOZIE_BASE_URL=\"http://${OOZIE_HTTP_HOSTNAME}:${OOZIE_HTTP_PORT}/oozie\"\nexport
JAVA_LIBRARY_PATH=/usr/lib/hadoop/lib/native/Linux-amd64-64", 
             "oozie_user": "oozie", 
-            "oozie_database": "New Derby Database", 
+            "oozie_admin_users": "{oozie_user}, {oozie_user}-admin",
+            "oozie_database": "New Derby Database",
             "oozie_data_dir": "/hadoop/oozie/data", 
             "oozie_log_dir": "/var/log/oozie"
         }, 

http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6bec82/ambari-server/src/test/python/stacks/2.0.6/configs/default_oozie_mysql.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default_oozie_mysql.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default_oozie_mysql.json
index 6a93e85..286a728 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/default_oozie_mysql.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default_oozie_mysql.json
@@ -552,8 +552,9 @@
             "oozie_hostname": "abtest-3.c.pramod-thangali.internal", 
             "oozie_pid_dir": "/var/run/oozie", 
             "content": "\n#!/bin/bash\n\nif [ -d \"/usr/lib/bigtop-tomcat\" ]; then\n  export
OOZIE_CONFIG=${OOZIE_CONFIG:-/etc/oozie/conf}\n  export CATALINA_BASE=${CATALINA_BASE:-/var/lib/oozie/oozie-server}\n
 export CATALINA_TMPDIR=${CATALINA_TMPDIR:-/var/tmp/oozie}\n  export OOZIE_CATALINA_HOME=/usr/lib/bigtop-tomcat\nfi\n\n#Set
JAVA HOME\nexport JAVA_HOME={{java_home}}\n\nexport JRE_HOME=${JAVA_HOME}\n\n# Set Oozie specific
environment variables here.\n\n# Settings for the Embedded Tomcat that runs Oozie\n# Java
System properties for Oozie should be specified in this variable\n#\n# export CATALINA_OPTS=\n\n#
Oozie configuration file to load from Oozie configuration directory\n#\n# export OOZIE_CONFIG_FILE=oozie-site.xml\n\n#
Oozie logs directory\n#\nexport OOZIE_LOG={{oozie_log_dir}}\n\n# Oozie pid directory\n#\nexport
CATALINA_PID={{pid_file}}\n\n#Location of the data for oozie\nexport OOZIE_DATA={{oozie_data_dir}}\n\n#
Oozie Log4J configuration file to load from Oozie config
 uration directory\n#\n# export OOZIE_LOG4J_FILE=oozie-log4j.properties\n\n# Reload interval
of the Log4J configuration file, in seconds\n#\n# export OOZIE_LOG4J_RELOAD=10\n\n# The port
Oozie server runs\n#\nexport OOZIE_HTTP_PORT={{oozie_server_port}}\n\n# The admin port Oozie
server runs\n#\nexport OOZIE_ADMIN_PORT={{oozie_server_admin_port}}\n\n# The host name Oozie
server runs on\n#\n# export OOZIE_HTTP_HOSTNAME=`hostname -f`\n\n# The base URL for callback
URLs to Oozie\n#\n# export OOZIE_BASE_URL=\"http://${OOZIE_HTTP_HOSTNAME}:${OOZIE_HTTP_PORT}/oozie\"\nexport
JAVA_LIBRARY_PATH=/usr/lib/hadoop/lib/native/Linux-amd64-64", 
-            "oozie_user": "oozie", 
-            "oozie_database": "New Derby Database", 
+            "oozie_user": "oozie",
+            "oozie_admin_users": "{oozie_user}, {oozie_user}-admin",
+            "oozie_database": "New Derby Database",
             "oozie_data_dir": "/hadoop/oozie/data", 
             "oozie_log_dir": "/var/log/oozie"
         }, 

http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6bec82/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json b/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json
index 1d40121..c50a923 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json
@@ -639,8 +639,9 @@
             "oozie_hostname": "abtest-3.c.pramod-thangali.internal", 
             "oozie_pid_dir": "/var/run/oozie", 
             "content": "\n#!/bin/bash\n\nif [ -d \"/usr/lib/bigtop-tomcat\" ]; then\n  export
OOZIE_CONFIG=${OOZIE_CONFIG:-/etc/oozie/conf}\n  export CATALINA_BASE=${CATALINA_BASE:-/var/lib/oozie/oozie-server}\n
 export CATALINA_TMPDIR=${CATALINA_TMPDIR:-/var/tmp/oozie}\n  export OOZIE_CATALINA_HOME=/usr/lib/bigtop-tomcat\nfi\n\n#Set
JAVA HOME\nexport JAVA_HOME={{java_home}}\n\nexport JRE_HOME=${JAVA_HOME}\n\n# Set Oozie specific
environment variables here.\n\n# Settings for the Embedded Tomcat that runs Oozie\n# Java
System properties for Oozie should be specified in this variable\n#\n# export CATALINA_OPTS=\n\n#
Oozie configuration file to load from Oozie configuration directory\n#\n# export OOZIE_CONFIG_FILE=oozie-site.xml\n\n#
Oozie logs directory\n#\nexport OOZIE_LOG={{oozie_log_dir}}\n\n# Oozie pid directory\n#\nexport
CATALINA_PID={{pid_file}}\n\n#Location of the data for oozie\nexport OOZIE_DATA={{oozie_data_dir}}\n\n#
Oozie Log4J configuration file to load from Oozie config
 uration directory\n#\n# export OOZIE_LOG4J_FILE=oozie-log4j.properties\n\n# Reload interval
of the Log4J configuration file, in seconds\n#\n# export OOZIE_LOG4J_RELOAD=10\n\n# The port
Oozie server runs\n#\nexport OOZIE_HTTP_PORT={{oozie_server_port}}\n\n# The admin port Oozie
server runs\n#\nexport OOZIE_ADMIN_PORT={{oozie_server_admin_port}}\n\n# The host name Oozie
server runs on\n#\n# export OOZIE_HTTP_HOSTNAME=`hostname -f`\n\n# The base URL for callback
URLs to Oozie\n#\n# export OOZIE_BASE_URL=\"http://${OOZIE_HTTP_HOSTNAME}:${OOZIE_HTTP_PORT}/oozie\"\nexport
JAVA_LIBRARY_PATH=/usr/lib/hadoop/lib/native/Linux-amd64-64", 
-            "oozie_user": "oozie", 
-            "oozie_database": "New Derby Database", 
+            "oozie_user": "oozie",
+            "oozie_admin_users": "{oozie_user}, {oozie_user}-admin",
+            "oozie_database": "New Derby Database",
             "oozie_data_dir": "/hadoop/oozie/data", 
             "oozie_log_dir": "/var/log/oozie",
             "oozie_keytab": "/etc/security/keytabs/oozie.service.keytab"

http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6bec82/ambari-server/src/test/python/stacks/2.2/configs/oozie-downgrade.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.2/configs/oozie-downgrade.json b/ambari-server/src/test/python/stacks/2.2/configs/oozie-downgrade.json
index 5e71ad7..5fca4e9 100644
--- a/ambari-server/src/test/python/stacks/2.2/configs/oozie-downgrade.json
+++ b/ambari-server/src/test/python/stacks/2.2/configs/oozie-downgrade.json
@@ -72,8 +72,9 @@
             "oozie_pid_dir": "/var/run/oozie", 
             "oozie_existing_mssql_server_2_database": "MSSQL", 
             "content": "\n#!/bin/bash\n\nif [ -d \"/usr/lib/bigtop-tomcat\" ]; then\n  export
OOZIE_CONFIG=${OOZIE_CONFIG:-/etc/oozie/conf}\n  export CATALINA_BASE=${CATALINA_BASE:-{{oozie_server_dir}}}\n
 export CATALINA_TMPDIR=${CATALINA_TMPDIR:-/var/tmp/oozie}\n  export OOZIE_CATALINA_HOME=/usr/lib/bigtop-tomcat\nfi\n\n#Set
JAVA HOME\nexport JAVA_HOME={{java_home}}\n\nexport JRE_HOME=${JAVA_HOME}\n\n# Set Oozie specific
environment variables here.\n\n# Settings for the Embedded Tomcat that runs Oozie\n# Java
System properties for Oozie should be specified in this variable\n#\n# export CATALINA_OPTS=\n\n#
Oozie configuration file to load from Oozie configuration directory\n#\n# export OOZIE_CONFIG_FILE=oozie-site.xml\n\n#
Oozie logs directory\n#\nexport OOZIE_LOG={{oozie_log_dir}}\n\n# Oozie pid directory\n#\nexport
CATALINA_PID={{pid_file}}\n\n#Location of the data for oozie\nexport OOZIE_DATA={{oozie_data_dir}}\n\n#
Oozie Log4J configuration file to load from Oozie configuration
  directory\n#\n# export OOZIE_LOG4J_FILE=oozie-log4j.properties\n\n# Reload interval of the
Log4J configuration file, in seconds\n#\n# export OOZIE_LOG4J_RELOAD=10\n\n# The port Oozie
server runs\n#\nexport OOZIE_HTTP_PORT={{oozie_server_port}}\n\n# The admin port Oozie server
runs\n#\nexport OOZIE_ADMIN_PORT={{oozie_server_admin_port}}\n\n# The host name Oozie server
runs on\n#\n# export OOZIE_HTTP_HOSTNAME=`hostname -f`\n\n# The base URL for callback URLs
to Oozie\n#\n# export OOZIE_BASE_URL=\"http://${OOZIE_HTTP_HOSTNAME}:${OOZIE_HTTP_PORT}/oozie\"\nexport
JAVA_LIBRARY_PATH={{hadoop_lib_home}}/native/Linux-amd64-64\n\n# At least 1 minute of retry
time to account for server downtime during\n# upgrade/downgrade\nexport OOZIE_CLIENT_OPTS=\"${OOZIE_CLIENT_OPTS}
-Doozie.connection.retry.count=5 \"\n\n# This is needed so that Oozie does not run into OOM
or GC Overhead limit\n# exceeded exceptions. If the oozie server is handling large number
of\n# workflows/coordinator jobs, the memory
  settings may need to be revised\nexport CATALINA_OPTS=\"${CATALINA_OPTS} -Xmx2048m -XX:MaxPermSize=256m
\"", 
-            "oozie_user": "oozie", 
-            "oozie_existing_mysql_host": "c6402.ambari.apache.org", 
+            "oozie_user": "oozie",
+            "oozie_admin_users": "{oozie_user}, {oozie_user}-admin",
+            "oozie_existing_mysql_host": "c6402.ambari.apache.org",
             "oozie_database": "New Derby Database", 
             "oozie_existing_oracle_host": "c6402.ambari.apache.org", 
             "oozie_derby_database": "Derby", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6bec82/ambari-server/src/test/python/stacks/2.2/configs/oozie-upgrade.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.2/configs/oozie-upgrade.json b/ambari-server/src/test/python/stacks/2.2/configs/oozie-upgrade.json
index 036b821..f0798c8 100644
--- a/ambari-server/src/test/python/stacks/2.2/configs/oozie-upgrade.json
+++ b/ambari-server/src/test/python/stacks/2.2/configs/oozie-upgrade.json
@@ -71,8 +71,9 @@
             "oozie_pid_dir": "/var/run/oozie", 
             "oozie_existing_mssql_server_2_database": "MSSQL", 
             "content": "\n#!/bin/bash\n\nif [ -d \"/usr/lib/bigtop-tomcat\" ]; then\n  export
OOZIE_CONFIG=${OOZIE_CONFIG:-/etc/oozie/conf}\n  export CATALINA_BASE=${CATALINA_BASE:-{{oozie_server_dir}}}\n
 export CATALINA_TMPDIR=${CATALINA_TMPDIR:-/var/tmp/oozie}\n  export OOZIE_CATALINA_HOME=/usr/lib/bigtop-tomcat\nfi\n\n#Set
JAVA HOME\nexport JAVA_HOME={{java_home}}\n\nexport JRE_HOME=${JAVA_HOME}\n\n# Set Oozie specific
environment variables here.\n\n# Settings for the Embedded Tomcat that runs Oozie\n# Java
System properties for Oozie should be specified in this variable\n#\n# export CATALINA_OPTS=\n\n#
Oozie configuration file to load from Oozie configuration directory\n#\n# export OOZIE_CONFIG_FILE=oozie-site.xml\n\n#
Oozie logs directory\n#\nexport OOZIE_LOG={{oozie_log_dir}}\n\n# Oozie pid directory\n#\nexport
CATALINA_PID={{pid_file}}\n\n#Location of the data for oozie\nexport OOZIE_DATA={{oozie_data_dir}}\n\n#
Oozie Log4J configuration file to load from Oozie configuration
  directory\n#\n# export OOZIE_LOG4J_FILE=oozie-log4j.properties\n\n# Reload interval of the
Log4J configuration file, in seconds\n#\n# export OOZIE_LOG4J_RELOAD=10\n\n# The port Oozie
server runs\n#\nexport OOZIE_HTTP_PORT={{oozie_server_port}}\n\n# The admin port Oozie server
runs\n#\nexport OOZIE_ADMIN_PORT={{oozie_server_admin_port}}\n\n# The host name Oozie server
runs on\n#\n# export OOZIE_HTTP_HOSTNAME=`hostname -f`\n\n# The base URL for callback URLs
to Oozie\n#\n# export OOZIE_BASE_URL=\"http://${OOZIE_HTTP_HOSTNAME}:${OOZIE_HTTP_PORT}/oozie\"\nexport
JAVA_LIBRARY_PATH={{hadoop_lib_home}}/native/Linux-amd64-64\n\n# At least 1 minute of retry
time to account for server downtime during\n# upgrade/downgrade\nexport OOZIE_CLIENT_OPTS=\"${OOZIE_CLIENT_OPTS}
-Doozie.connection.retry.count=5 \"\n\n# This is needed so that Oozie does not run into OOM
or GC Overhead limit\n# exceeded exceptions. If the oozie server is handling large number
of\n# workflows/coordinator jobs, the memory
  settings may need to be revised\nexport CATALINA_OPTS=\"${CATALINA_OPTS} -Xmx2048m -XX:MaxPermSize=256m
\"", 
-            "oozie_user": "oozie", 
-            "oozie_existing_mysql_host": "c6402.ambari.apache.org", 
+            "oozie_user": "oozie",
+            "oozie_admin_users": "{oozie_user}, {oozie_user}-admin",
+            "oozie_existing_mysql_host": "c6402.ambari.apache.org",
             "oozie_database": "New Derby Database", 
             "oozie_existing_oracle_host": "c6402.ambari.apache.org", 
             "oozie_derby_database": "Derby", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6bec82/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c698654..fa49171 100644
--- a/pom.xml
+++ b/pom.xml
@@ -242,138 +242,6 @@
         </configuration>
       </plugin>
       <plugin>
-        <groupId>org.apache.rat</groupId>
-        <artifactId>apache-rat-plugin</artifactId>
-        <configuration>
-          <excludes>
-            <exclude>**/repo_*.j2</exclude>
-            <exclude>**/ambari-log4j.spec</exclude>
-            <exclude>**/version.txt</exclude>
-            <exclude>**/release.txt</exclude>
-            <exclude>**/*.list</exclude>
-            <exclude>**/hdp_mon_nagios_addons.conf</exclude>
-            <exclude>**/*.json</exclude>
-            <exclude>**/*.svg</exclude>
-            <exclude>derby.log</exclude>
-            <exclude>CHANGES.txt</exclude>
-            <exclude>pass.txt</exclude>
-            <exclude>ambari-metrics/ambari-metrics-host-monitoring/conf/unix/metric_groups.conf</exclude>
-            <exclude>ambari-metrics/ambari-metrics-host-monitoring/conf/windows/metric_groups.conf</exclude>
-            <exclude>contrib/addons/test/dataServices/jmx/data/cluster_configuration.json.nohbase</exclude>
-            <exclude>contrib/ambari-scom/msi/src/GUI_Ambari.sln</exclude>
-            <exclude>contrib/fast-hdfs-resource/dependency-reduced-pom.xml</exclude>
-            <exclude>version</exclude>
-            <!--IDE and GIT files-->
-            <exclude>**/.idea/</exclude>
-            <exclude>**/.classpath/</exclude>
-            <exclude>**/.project/</exclude>
-            <exclude>**/.settings/</exclude>
-            <exclude>.git/</exclude>
-            <exclude>.pydevproject</exclude>
-            <exclude>**/.gitignore</exclude>
-            <exclude>**/.gitattributes</exclude>
-            <exclude>**/.gitkeep</exclude>
-            <exclude>**/.jshintrc</exclude>
-            <exclude>**/.editorconfig</exclude>
-            <!--gitignore content-->
-            <exclude>.DS_Store</exclude>
-            <exclude>**/*.iml</exclude>
-            <exclude>*.pyc</exclude>
-            <exclude>*.py~</exclude>
-            <exclude>.hg</exclude>
-            <exclude>.hgignore</exclude>
-            <exclude>.hgtags</exclude>
-
-            <!--Python Mock library (BSD license)-->
-            <exclude>ambari-common/src/test/python/mock/**</exclude>
-            <!--Jinja2 library (BSD license)-->
-            <exclude>ambari-common/src/main/python/ambari_jinja2/**</exclude>
-            <exclude>ambari-common/src/main/python/jinja2/**</exclude>
-            <!--Simplejson library (MIT license)-->
-            <exclude>ambari-common/src/main/python/ambari_simplejson/**</exclude>
-
-            <exclude>ambari-web/node_modules/**</exclude>
-
-            <!--Contributions-->
-            <exclude>contrib/ambari-scom/management-pack/Hadoop_MP/**</exclude>
-            <exclude>contrib/addons/test/dataServices/jmx/data/cluster_configuration.json.nohbase</exclude>
-            <exclude>contrib/ambari-scom/msi/src/GUI_Ambari.sln</exclude>
-            <exclude>contrib/ambari-scom/ambari-scom-server/pass.txt</exclude>
-            <exclude>contrib/ambari-scom/*/rat.txt</exclude>
-            <exclude>contrib/ambari-scom/metrics-sink/target/**</exclude>
-            <exclude>contrib/views/*/target/**</exclude>
-            <exclude>contrib/views/hive/src/main/resources/ui/hive-web/vendor/codemirror/**</exclude>
-            <exclude>contrib/views/hive/src/main/resources/ui/hive-web/.bowerrc</exclude>
-            <exclude>contrib/views/files/src/main/resources/ui/bower_components/**</exclude>
-            <exclude>contrib/views/files/src/main/resources/ui/node/**</exclude>
-            <exclude>contrib/views/files/src/main/resources/ui/node_modules/**</exclude>
-            <exclude>contrib/views/files/src/main/resources/ui/public/**</exclude>
-            <exclude>contrib/views/files/src/main/resources/ui/vendor/**</exclude>
-            <exclude>contrib/views/files/src/main/resources/ui/runner.js</exclude>
-            <exclude>contrib/views/files/src/main/resources/ui/app/assets/stylesheets/**</exclude>
-            <exclude>contrib/views/files/src/main/resources/ui/app/assets/javascripts/**</exclude>
-            <exclude>contrib/views/jobs/src/main/resources/ui/.tmp/**</exclude>
-            <exclude>contrib/views/jobs/src/main/resources/ui/**/bower_components/**</exclude>
-            <exclude>contrib/views/jobs/src/main/resources/ui/dist/**</exclude>
-            <exclude>contrib/views/jobs/src/main/resources/ui/node/**</exclude>
-            <exclude>contrib/views/jobs/src/main/resources/ui/node_modules/**</exclude>
-            <exclude>contrib/views/jobs/src/main/resources/ui/**/.bowerrc</exclude>
-            <exclude>contrib/views/pig/src/main/resources/ui/pig-web/public/**</exclude>
-            <exclude>contrib/views/pig/src/main/resources/ui/pig-web/node_modules/**</exclude>
-            <exclude>contrib/views/pig/src/main/resources/ui/pig-web/node/**</exclude>
-            <exclude>contrib/views/pig/src/main/resources/ui/pig-web/bower_components/**</exclude>
-            <exclude>contrib/views/pig/src/main/resources/ui/pig-web/vendor/**</exclude>
-            <exclude>contrib/views/pig/src/main/resources/ui/pig-web/app/assets/static/stylesheets/**</exclude>
-            <exclude>contrib/views/pig/src/main/resources/ui/pig-web/app/assets/static/javascripts/**</exclude>
-            <exclude>contrib/views/pig/src/main/resources/ui/pig-web/runner.js</exclude>
-            <exclude>contrib/views/slider/src/main/resources/ui/public/**</exclude>
-            <exclude>contrib/views/slider/src/main/resources/ui/node_modules/**</exclude>
-            <exclude>contrib/views/slider/src/main/resources/ui/vendor/**</exclude>
-            <exclude>contrib/views/slider/src/main/resources/ui/app/assets/stylesheets/**</exclude>
-            <exclude>contrib/views/slider/src/main/resources/ui/app/assets/javascripts/**</exclude>
-            <exclude>contrib/views/slider/src/main/resources/ui/bower_components/**</exclude>
-            <exclude>contrib/views/slider/src/main/resources/ui/runner.js</exclude>
-	    <exclude>contrib/views/storm/src/main/resources/libs/**</exclude>
-            <exclude>contrib/views/storm/src/main/resources/styles/default.css</exclude>
-            <exclude>contrib/views/storm/src/main/resources/templates/**</exclude>
-            <exclude>contrib/addons/package/deb/nagios_addon_deb_control</exclude>
-            <exclude>contrib/addons/src/addOns/nagios/conf.d/hdp_mon_nagios_addons.conf</exclude>
-            <exclude>contrib/views/*/.classpath</exclude>
-            <exclude>contrib/views/*/.project</exclude>
-            <exclude>contrib/views/*/.settings/**</exclude>
-            <exclude>contrib/views/capacity-scheduler/src/main/resources/ui/app/**</exclude>
-            <exclude>contrib/views/capacity-scheduler/src/main/resources/ui/runner.js</exclude>
-
-            <exclude>contrib/ambari-scom/ambari-scom-server/pass.txt</exclude>
-            <exclude>contrib/ambari-scom/ambari-scom-server/target/**</exclude>
-            <exclude>contrib/ambari-scom/*/rat.txt</exclude>
-            <exclude>contrib/ambari-scom/metrics-sink/target/**</exclude>
-
-            <!--Velocity log -->
-            <exclude>**/velocity.log*</exclude>
-
-            <!-- Metrics module -->
-            <!-- psutil : external lib, Apache 2.0 license included as a source file -->
-            <exclude>ambari-metrics/target/**</exclude>
-            <exclude>ambari-metrics/ambari-metrics-host-monitoring/src/main/python/psutil/**</exclude>
-            <exclude>ambari-metrics/target/rpm/ambari-metrics/SPECS/ambari-metrics.spec</exclude>
-            <exclude>ambari-metrics/ambari-metrics-timelineservice/src/test/resources/lib/org/apache/phoenix/phoenix-core-tests/4.2.0/phoenix-core-tests-4.2.0.pom</exclude>
-            <exclude>ambari-metrics/ambari-metrics-timelineservice/src/test/resources/lib/org/apache/phoenix/phoenix-core-tests/maven-metadata-local.xml</exclude>
-            <exclude>ambari-metrics/*/target/**</exclude>
-            <!-- ignore .settings and .project  -->
-            <exclude>ambari-metrics/**/.*/**</exclude>
-          </excludes>
-        </configuration>
-        <executions>
-          <execution>
-            <phase>test</phase>
-            <goals>
-              <goal>check</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
         <groupId>org.vafer</groupId>
         <artifactId>jdeb</artifactId>
         <version>1.0.1</version>


Mime
View raw message