Repository: ambari Updated Branches: refs/heads/trunk ea081968d -> fb3318355
AMBARI-6389. Need a cleanup of global.xml properties no longer used by agent (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fb331835 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fb331835 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fb331835 Branch: refs/heads/trunk Commit: fb331835532510e4fb195690e115e6b2a29aff51 Parents: ea08196 Author: Andrew Onishuk <[email protected]> Authored: Fri Jul 4 18:01:56 2014 +0300 Committer: Andrew Onishuk <[email protected]> Committed: Fri Jul 4 18:01:56 2014 +0300 ---------------------------------------------------------------------- .../services/HBASE/configuration/global.xml | 99 +------------------- .../services/HDFS/configuration/global.xml | 87 +---------------- .../services/HIVE/configuration/global.xml | 23 +---- .../services/OOZIE/configuration/global.xml | 16 ---- .../services/ZOOKEEPER/configuration/global.xml | 5 - .../services/HDFS/configuration/global.xml | 5 - .../services/HBASE/configuration/global.xml | 99 +------------------- .../services/HDFS/configuration/global.xml | 85 ----------------- .../services/HIVE/configuration/global.xml | 31 ------ .../services/HIVE/package/scripts/params.py | 1 - .../services/OOZIE/configuration/global.xml | 16 ---- .../services/OOZIE/package/scripts/params.py | 1 - .../services/ZOOKEEPER/configuration/global.xml | 5 - ambari-web/app/data/HDP2/global_properties.js | 36 ------- ambari-web/app/data/global_properties.js | 12 --- 15 files changed, 6 insertions(+), 515 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/fb331835/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/configuration/global.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/configuration/global.xml b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/configuration/global.xml index e7a3001..9d89400 100644 --- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/configuration/global.xml +++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/configuration/global.xml @@ -29,17 +29,12 @@ <property> <name>hbase_pid_dir</name> <value>/var/run/hbase</value> - <description>Log Directories for HBase.</description> - </property> - <property> - <name>hbase_log_dir</name> - <value>/var/log/hbase</value> - <description>Log Directories for HBase.</description> + <description>Pid Directory for HBase.</description> </property> <property> <name>hbase_regionserver_heapsize</name> <value>1024</value> - <description>Log Directories for HBase.</description> + <description>HBase RegionServer Heap Size.</description> </property> <property> <name>hbase_master_heapsize</name> @@ -47,96 +42,6 @@ <description>HBase Master Heap Size</description> </property> <property> - <name>hstore_compactionthreshold</name> - <value>3</value> - <description>HBase HStore compaction threshold.</description> - </property> - <property> - <name>hfile_blockcache_size</name> - <value>0.25</value> - <description>HFile block cache size.</description> - </property> - <property> - <name>hstorefile_maxsize</name> - <value>10737418240</value> - <description>Maximum HStoreFile Size</description> - </property> - <property> - <name>regionserver_handlers</name> - <value>30</value> - <description>HBase RegionServer Handler</description> - </property> - <property> - <name>hregion_majorcompaction</name> - <value>86400000</value> - <description>HBase Major Compaction.</description> - </property> - <property> - <name>hregion_blockmultiplier</name> - <value>2</value> - <description>HBase Region Block Multiplier</description> - </property> - <property> - <name>client_scannercaching</name> - <value>100</value> - <description>Base Client Scanner Caching</description> - </property> - <property> - <name>zookeeper_sessiontimeout</name> - <value>60000</value> - <description>ZooKeeper Session Timeout</description> - </property> - <property> - <name>hfile_max_keyvalue_size</name> - <value>10485760</value> - <description>HBase Client Maximum key-value Size</description> - </property> - <property> - <name>hbase_hdfs_root_dir</name> - <value>/apps/hbase/data</value> - <description>HBase Relative Path to HDFS.</description> - </property> - <property> - <name>hbase_conf_dir</name> - <value>/etc/hbase</value> - <description>Config Directory for HBase.</description> - </property> - <property> - <name>hdfs_enable_shortcircuit_read</name> - <value>true</value> - <description>HDFS Short Circuit Read</description> - </property> - <property> - <name>hdfs_support_append</name> - <value>true</value> - <description>HDFS append support</description> - </property> - <property> - <name>hstore_blockingstorefiles</name> - <value>7</value> - <description>HStore blocking storefiles.</description> - </property> - <property> - <name>regionserver_memstore_lab</name> - <value>true</value> - <description>Region Server memstore.</description> - </property> - <property> - <name>regionserver_memstore_lowerlimit</name> - <value>0.35</value> - <description>Region Server memstore lower limit.</description> - </property> - <property> - <name>regionserver_memstore_upperlimit</name> - <value>0.4</value> - <description>Region Server memstore upper limit.</description> - </property> - <property> - <name>hbase_conf_dir</name> - <value>/etc/hbase</value> - <description>HBase conf dir.</description> - </property> - <property> <name>hbase_user</name> <value>hbase</value> <description>HBase User Name.</description> http://git-wip-us.apache.org/repos/asf/ambari/blob/fb331835/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/configuration/global.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/configuration/global.xml b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/configuration/global.xml index 701036e..3cc6460 100644 --- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/configuration/global.xml +++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/configuration/global.xml @@ -22,21 +22,6 @@ <configuration> <property> - <name>dfs_name_dir</name> - <value>/hadoop/hdfs/namenode</value> - <description>NameNode Directories.</description> - </property> - <property> - <name>fs_checkpoint_dir</name> - <value>/hadoop/hdfs/namesecondary</value> - <description>Secondary NameNode checkpoint dir.</description> - </property> - <property> - <name>dfs_data_dir</name> - <value>/hadoop/hdfs/data</value> - <description>Data directories for Data Nodes.</description> - </property> - <property> <name>hdfs_log_dir_prefix</name> <value>/var/log/hadoop</value> <description>Hadoop Log Dir Prefix</description> @@ -47,11 +32,6 @@ <description>Hadoop PID Dir Prefix</description> </property> <property> - <name>dfs_webhdfs_enabled</name> - <value>true</value> - <description>WebHDFS enabled</description> - </property> - <property> <name>hadoop_heapsize</name> <value>1024</value> <description>Hadoop maximum Java heap size</description> @@ -72,70 +52,15 @@ <description>NameNode maximum new generation size</description> </property> <property> - <name>datanode_du_reserved</name> - <value>1</value> - <description>Reserved space for HDFS</description> - </property> - <property> <name>dtnode_heapsize</name> <value>1024</value> <description>DataNode maximum Java heap size</description> </property> <property> - <name>dfs_datanode_failed_volume_tolerated</name> - <value>0</value> - <description>DataNode volumes failure toleration</description> - </property> - <property> - <name>fs_checkpoint_period</name> - <value>21600</value> - <description>HDFS Maximum Checkpoint Delay</description> - </property> - <property> - <name>fs_checkpoint_size</name> - <value>0.5</value> - <description>FS Checkpoint Size.</description> - </property> - <property> <name>proxyuser_group</name> <value>users</value> <description>Proxy user group.</description> </property> - <property> - <name>dfs_exclude</name> - <value></value> - <description>HDFS Exclude hosts.</description> - </property> - <property> - <name>dfs_include</name> - <value></value> - <description>HDFS Include hosts.</description> - </property> - <property> - <name>dfs_replication</name> - <value>3</value> - <description>Default Block Replication.</description> - </property> - <property> - <name>dfs_block_local_path_access_user</name> - <value>hbase</value> - <description>Default Block Replication.</description> - </property> - <property> - <name>dfs_datanode_address</name> - <value>50010</value> - <description>Port for datanode address.</description> - </property> - <property> - <name>dfs_datanode_http_address</name> - <value>50075</value> - <description>Port for datanode address.</description> - </property> - <property> - <name>dfs_datanode_data_dir_perm</name> - <value>750</value> - <description>Datanode dir perms.</description> - </property> <property> <name>security_enabled</name> @@ -147,18 +72,8 @@ <value>EXAMPLE.COM</value> <description>Kerberos realm.</description> </property> - <property> - <name>keytab_path</name> - <value>/etc/security/keytabs</value> - <description>Kerberos keytab path.</description> - </property> - <property> - <name>namenode_formatted_mark_dir</name> - <value>/var/run/hadoop/hdfs/namenode/formatted/</value> - <description>Formatteed Mark Directory.</description> - </property> - <property> + <property> <name>hdfs_user</name> <value>hdfs</value> <description>User and Groups.</description> http://git-wip-us.apache.org/repos/asf/ambari/blob/fb331835/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/configuration/global.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/configuration/global.xml b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/configuration/global.xml index 12e01f8..601edeb 100644 --- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/configuration/global.xml +++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/configuration/global.xml @@ -42,23 +42,7 @@ <name>hive_database_name</name> <value>hive</value> <description>Database name.</description> - </property> - <property> - <name>hive_metastore_user_name</name> - <value>hive</value> - <description>Database username to use to connect to the database.</description> - </property> - <property require-input="true"> - <name>hive_metastore_user_passwd</name> - <value></value> - <type>PASSWORD</type> - <description>Database password to use to connect to the database.</description> - </property> - <property> - <name>hive_lib</name> - <value>/usr/lib/hive/lib/</value> - <description>Hive Library.</description> - </property> + </property> <property> <name>hive_dbroot</name> <value>/usr/lib/hive/lib/</value> @@ -80,11 +64,6 @@ <description>Hive PID Dir.</description> </property> <property> - <name>mysql_connector_url</name> - <value>${download_url}/mysql-connector-java-5.1.18.zip</value> - <description>Hive PID Dir.</description> - </property> - <property> <name>hive_aux_jars_path</name> <value>/usr/lib/hcatalog/share/hcatalog/hcatalog-core.jar</value> <description>Hive auxiliary jar path.</description> http://git-wip-us.apache.org/repos/asf/ambari/blob/fb331835/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/OOZIE/configuration/global.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/OOZIE/configuration/global.xml b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/OOZIE/configuration/global.xml index 657317b..6799fc5 100644 --- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/OOZIE/configuration/global.xml +++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/OOZIE/configuration/global.xml @@ -37,22 +37,6 @@ <description>Oozie Derby Database.</description> </property> <property> - <name>oozie_database_name</name> - <value>oozie</value> - <description>Database name used for the Oozie.</description> - </property> - <property> - <name>oozie_metastore_user_name</name> - <value>oozie</value> - <description>Database user name to use to connect to the database</description> - </property> - <property require-input = "true"> - <name>oozie_metastore_user_passwd</name> - <value></value> - <type>PASSWORD</type> - <description>Database password to use to connect to the database</description> - </property> - <property> <name>oozie_data_dir</name> <value>/hadoop/oozie/data</value> <description>Data directory in which the Oozie DB exists</description> http://git-wip-us.apache.org/repos/asf/ambari/blob/fb331835/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/ZOOKEEPER/configuration/global.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/ZOOKEEPER/configuration/global.xml b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/ZOOKEEPER/configuration/global.xml index ac60027..840e991 100644 --- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/ZOOKEEPER/configuration/global.xml +++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/ZOOKEEPER/configuration/global.xml @@ -42,11 +42,6 @@ <description>ZooKeeper Pid Dir</description> </property> <property> - <name>zk_pid_file</name> - <value>/var/run/zookeeper/zookeeper_server.pid</value> - <description>ZooKeeper Pid File</description> - </property> - <property> <name>tickTime</name> <value>2000</value> <description>The length of a single tick in milliseconds, which is the basic time unit used by ZooKeeper</description> http://git-wip-us.apache.org/repos/asf/ambari/blob/fb331835/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HDFS/configuration/global.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HDFS/configuration/global.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HDFS/configuration/global.xml index 49d66bb..c17de27 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HDFS/configuration/global.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HDFS/configuration/global.xml @@ -183,10 +183,5 @@ <value>hdfs</value> <description>User and Groups.</description> </property> - <property> - <name>lzo_enabled</name> - <value>true</value> - <description>LZO compression enabled</description> - </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/fb331835/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/configuration/global.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/configuration/global.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/configuration/global.xml index 7540276..2f64ce0 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/configuration/global.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/configuration/global.xml @@ -29,113 +29,18 @@ <property> <name>hbase_pid_dir</name> <value>/var/run/hbase</value> - <description>Log Directories for HBase.</description> - </property> - <property> - <name>hbase_log_dir</name> - <value>/var/log/hbase</value> - <description>Log Directories for HBase.</description> + <description>Pid Directory for HBase.</description> </property> <property> <name>hbase_regionserver_heapsize</name> <value>1024</value> - <description>Log Directories for HBase.</description> + <description>HBase RegionServer Heap Size.</description> </property> <property> <name>hbase_master_heapsize</name> <value>1024</value> <description>HBase Master Heap Size</description> </property> - <property> - <name>hstore_compactionthreshold</name> - <value>3</value> - <description>HBase HStore compaction threshold.</description> - </property> - <property> - <name>hfile_blockcache_size</name> - <value>0.40</value> - <description>HFile block cache size.</description> - </property> - <property> - <name>hstorefile_maxsize</name> - <value>10737418240</value> - <description>Maximum HStoreFile Size</description> - </property> - <property> - <name>regionserver_handlers</name> - <value>60</value> - <description>HBase RegionServer Handler</description> - </property> - <property> - <name>hregion_majorcompaction</name> - <value>604800000</value> - <description>The time between major compactions of all HStoreFiles in a region. Set to 0 to disable automated major compactions.</description> - </property> - <property> - <name>hregion_blockmultiplier</name> - <value>2</value> - <description>HBase Region Block Multiplier</description> - </property> - <property> - <name>client_scannercaching</name> - <value>100</value> - <description>Base Client Scanner Caching</description> - </property> - <property> - <name>zookeeper_sessiontimeout</name> - <value>30000</value> - <description>ZooKeeper Session Timeout</description> - </property> - <property> - <name>hfile_max_keyvalue_size</name> - <value>10485760</value> - <description>HBase Client Maximum key-value Size</description> - </property> - <property> - <name>hbase_hdfs_root_dir</name> - <value>/apps/hbase/data</value> - <description>HBase Relative Path to HDFS.</description> - </property> - <property> - <name>hbase_conf_dir</name> - <value>/etc/hbase</value> - <description>Config Directory for HBase.</description> - </property> - <property> - <name>hdfs_enable_shortcircuit_read</name> - <value>true</value> - <description>HDFS Short Circuit Read</description> - </property> - <property> - <name>hdfs_support_append</name> - <value>true</value> - <description>HDFS append support</description> - </property> - <property> - <name>hstore_blockingstorefiles</name> - <value>10</value> - <description>HStore blocking storefiles.</description> - </property> - <property> - <name>regionserver_memstore_lab</name> - <value>true</value> - <description>Region Server memstore.</description> - </property> - <property> - <name>regionserver_memstore_lowerlimit</name> - <value>0.38</value> - <description>Region Server memstore lower limit.</description> - </property> - <property> - <name>regionserver_memstore_upperlimit</name> - <value>0.4</value> - <description>Region Server memstore upper limit.</description> - </property> - <property> - <name>hbase_conf_dir</name> - <value>/etc/hbase</value> - <description>HBase conf dir.</description> - </property> <property> <name>hbase_user</name> <value>hbase</value> http://git-wip-us.apache.org/repos/asf/ambari/blob/fb331835/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/configuration/global.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/configuration/global.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/configuration/global.xml index aef5a20..17f1a0b 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/configuration/global.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/configuration/global.xml @@ -22,21 +22,6 @@ <configuration> <property> - <name>dfs_namenode_name_dir</name> - <value>/hadoop/hdfs/namenode</value> - <description>NameNode Directories.</description> - </property> - <property> - <name>dfs_namenode_checkpoint_dir</name> - <value>/hadoop/hdfs/namesecondary</value> - <description>Secondary NameNode checkpoint dir.</description> - </property> - <property> - <name>dfs_datanode_data_dir</name> - <value>/hadoop/hdfs/data</value> - <description>Data directories for Data Nodes.</description> - </property> - <property> <name>hdfs_log_dir_prefix</name> <value>/var/log/hadoop</value> <description>Hadoop Log Dir Prefix</description> @@ -47,11 +32,6 @@ <description>Hadoop PID Dir Prefix</description> </property> <property> - <name>dfs_webhdfs_enabled</name> - <value>true</value> - <description>WebHDFS enabled</description> - </property> - <property> <name>hadoop_heapsize</name> <value>1024</value> <description>Hadoop maximum Java heap size</description> @@ -72,60 +52,15 @@ <description>NameNode maximum new generation size</description> </property> <property> - <name>datanode_du_reserved</name> - <value>1073741824</value> - <description>Reserved space for HDFS</description> - </property> - <property> <name>dtnode_heapsize</name> <value>1024</value> <description>DataNode maximum Java heap size</description> </property> <property> - <name>dfs_datanode_failed_volume_tolerated</name> - <value>0</value> - <description>DataNode volumes failure toleration</description> - </property> - <property> - <name>dfs_namenode_checkpoint_period</name> - <value>21600</value> - <description>HDFS Maximum Checkpoint Delay</description> - </property> - <property> <name>proxyuser_group</name> <value>users</value> <description>Proxy user group.</description> </property> - <property> - <name>dfs_exclude</name> - <value></value> - <description>HDFS Exclude hosts.</description> - </property> - <property> - <name>dfs_replication</name> - <value>3</value> - <description>Default Block Replication.</description> - </property> - <property> - <name>dfs_block_local_path_access_user</name> - <value>hbase</value> - <description>Default Block Replication.</description> - </property> - <property> - <name>dfs_datanode_address</name> - <value>50010</value> - <description>Port for datanode address.</description> - </property> - <property> - <name>dfs_datanode_http_address</name> - <value>50075</value> - <description>Port for datanode address.</description> - </property> - <property> - <name>dfs_datanode_data_dir_perm</name> - <value>750</value> - <description>Datanode dir perms.</description> - </property> <property> <name>security_enabled</name> @@ -137,33 +72,13 @@ <value>EXAMPLE.COM</value> <description>Kerberos realm.</description> </property> - <property> - <name>keytab_path</name> - <value>/etc/security/keytabs</value> - <description>Kerberos keytab path.</description> - </property> <property> - <name>keytab_path</name> - <value>/etc/security/keytabs</value> - <description>KeyTab Directory.</description> - </property> - <property> - <name>namenode_formatted_mark_dir</name> - <value>/var/run/hadoop/hdfs/namenode/formatted/</value> - <description>Formatteed Mark Directory.</description> - </property> - <property> <name>hdfs_user</name> <value>hdfs</value> <description>User and Groups.</description> </property> <property> - <name>lzo_enabled</name> - <value>true</value> - <description>LZO compression enabled</description> - </property> - <property> <name>ignore_groupsusers_create</name> <value>false</value> <description>Whether to ignores failures on users and group creation</description> http://git-wip-us.apache.org/repos/asf/ambari/blob/fb331835/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/configuration/global.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/configuration/global.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/configuration/global.xml index 3b4db58..b5877cf 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/configuration/global.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/configuration/global.xml @@ -42,32 +42,11 @@ <name>hive_database_name</name> <value>hive</value> <description>Database name.</description> - </property> - <property> - <name>hive_metastore_user_name</name> - <value>hive</value> - <description>Database username to use to connect to the database.</description> - </property> - <property require-input="true"> - <name>hive_metastore_user_passwd</name> - <value></value> - <type>PASSWORD</type> - <description>Database password to use to connect to the database.</description> </property> <property> - <name>hive_lib</name> - <value>/usr/lib/hive/lib/</value> - <description>Hive Library.</description> - </property> - <property> <name>hive_dbroot</name> <value>/usr/lib/hive/lib/</value> <description>Hive DB Directory.</description> - </property> - <property> - <name>hive_conf_dir</name> - <value>/etc/hive/conf</value> - <description>Hive Conf Dir.</description> </property> <property> <name>hive_log_dir</name> @@ -80,16 +59,6 @@ <description>Hive PID Dir.</description> </property> <property> - <name>mysql_connector_url</name> - <value>${download_url}/mysql-connector-java-5.1.18.zip</value> - <description>Hive PID Dir.</description> - </property> - <property> - <name>hive_aux_jars_path</name> - <value>/usr/lib/hcatalog/share/hcatalog/hcatalog-core.jar</value> - <description>Hive auxiliary jar path.</description> - </property> - <property> <name>hive_user</name> <value>hive</value> <description>Hive User.</description> http://git-wip-us.apache.org/repos/asf/ambari/blob/fb331835/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/params.py index dc3fbb6..4fac349 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/params.py @@ -103,7 +103,6 @@ driver_curl_source = format("{jdk_location}/{jdbc_symlink_name}") start_hiveserver2_path = "/tmp/start_hiveserver2_script" start_metastore_path = "/tmp/start_metastore_script" -hive_aux_jars_path = config['configurations']['global']['hive_aux_jars_path'] hadoop_heapsize = config['configurations']['global']['hadoop_heapsize'] hive_heapsize = config['configurations']['hive-site']['hive.heapsize'] java64_home = config['hostLevelParams']['java_home'] http://git-wip-us.apache.org/repos/asf/ambari/blob/fb331835/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/configuration/global.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/configuration/global.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/configuration/global.xml index 3c7b035..03cff07 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/configuration/global.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/configuration/global.xml @@ -37,22 +37,6 @@ <description>Oozie Derby Database</description> </property> <property> - <name>oozie_database_name</name> - <value>oozie</value> - <description>Database name used for the Oozie.</description> - </property> - <property> - <name>oozie_metastore_user_name</name> - <value>oozie</value> - <description>Database user name to use to connect to the database</description> - </property> - <property require-input = "true"> - <name>oozie_metastore_user_passwd</name> - <value></value> - <type>PASSWORD</type> - <description>Database password to use to connect to the database</description> - </property> - <property> <name>oozie_data_dir</name> <value>/hadoop/oozie/data</value> <description>Data directory in which the Oozie DB exists</description> http://git-wip-us.apache.org/repos/asf/ambari/blob/fb331835/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/params.py index 59451aa..3e8cd4a 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/params.py @@ -41,7 +41,6 @@ hadoop_jar_location = "/usr/lib/hadoop/" # for HDP1 it's "/usr/share/HDP-oozie/ext.zip" ext_js_path = "/usr/share/HDP-oozie/ext-2.2.zip" oozie_libext_dir = "/usr/lib/oozie/libext" -lzo_enabled = config['configurations']['global']['lzo_enabled'] _authentication = config['configurations']['core-site']['hadoop.security.authentication'] security_enabled = ( not is_empty(_authentication) and _authentication == 'kerberos') http://git-wip-us.apache.org/repos/asf/ambari/blob/fb331835/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/configuration/global.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/configuration/global.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/configuration/global.xml index ac60027..840e991 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/configuration/global.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/configuration/global.xml @@ -42,11 +42,6 @@ <description>ZooKeeper Pid Dir</description> </property> <property> - <name>zk_pid_file</name> - <value>/var/run/zookeeper/zookeeper_server.pid</value> - <description>ZooKeeper Pid File</description> - </property> - <property> <name>tickTime</name> <value>2000</value> <description>The length of a single tick in milliseconds, which is the basic time unit used by ZooKeeper</description> http://git-wip-us.apache.org/repos/asf/ambari/blob/fb331835/ambari-web/app/data/HDP2/global_properties.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/data/HDP2/global_properties.js b/ambari-web/app/data/HDP2/global_properties.js index f4868ca..27fb6b0 100644 --- a/ambari-web/app/data/HDP2/global_properties.js +++ b/ambari-web/app/data/HDP2/global_properties.js @@ -234,30 +234,6 @@ module.exports = "serviceName": "HDFS", "category": "Advanced" }, - { - "id": "puppet var", - "name": "hcat_conf_dir", - "displayName": "HCat conf directory", - "description": "", - "defaultValue": "", - "isRequired": false, - "isReconfigurable": false, - "displayType": "directory", - "isVisible": false, - "serviceName": "HDFS", - "category": "Advanced" - }, - { - "id": "puppet var", - "name": "lzo_enabled", - "displayName": "LZO compression", - "description": "LZO compression enabled", - "defaultValue": true, - "displayType": "checkbox", - "isOverridable": false, - "isVisible": false, - "serviceName": "HDFS" - }, /**********************************************MAPREDUCE2***************************************/ { @@ -900,18 +876,6 @@ module.exports = "serviceName": "HIVE", "category": "Advanced" }, - { - "id": "puppet var", - "name": "hive_aux_jars_path", - "displayName": "Hive auxilary jar path", - "description": "", - "defaultValue": "/usr/lib/hcatalog/share/hcatalog/hcatalog-core.jar", - "isReconfigurable": false, - "displayType": "directory", - "isVisible": false, - "serviceName": "HIVE", - "category": "Advanced" - }, /**********************************************WEBHCAT***************************************/ { "id": "puppet var", http://git-wip-us.apache.org/repos/asf/ambari/blob/fb331835/ambari-web/app/data/global_properties.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/data/global_properties.js b/ambari-web/app/data/global_properties.js index 4812eb2..501fbfc 100644 --- a/ambari-web/app/data/global_properties.js +++ b/ambari-web/app/data/global_properties.js @@ -834,18 +834,6 @@ module.exports = }, { "id": "puppet var", - "name": "mysql_connector_url", - "displayName": "MySQL connector url", - "description": "", - "defaultValue": "${download_url}/mysql-connector-java-5.1.18.zip", - "isReconfigurable": false, - "displayType": "directory", - "isVisible": false, - "serviceName": "HIVE", - "category": "Advanced" - }, - { - "id": "puppet var", "name": "hive_aux_jars_path", "displayName": "Hive auxilary jar path", "description": "",
