You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sw...@apache.org on 2013/03/14 01:19:47 UTC
svn commit: r1456291 - in /incubator/ambari/trunk: ./
ambari-agent/src/main/puppet/modules/hdp-hue/
ambari-agent/src/main/puppet/modules/hdp-hue/manifests/
ambari-agent/src/main/puppet/modules/hdp-hue/manifests/hue/
ambari-agent/src/main/puppet/modules...
Author: swagle
Date: Thu Mar 14 00:19:47 2013
New Revision: 1456291
URL: http://svn.apache.org/r1456291
Log:
AMBARI-1585. Creating the agent scripts for Hue server installation and configuration on the Hue host. (swagle)
Added:
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hue/
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/hue/
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/hue/service_check.pp
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/init.pp
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/params.pp
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/server.pp
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/service.pp
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hue/templates/
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hue/templates/hue-ini.cfg.erb
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp
incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py
incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/manifestGenerator.py
incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/metadata/RoleCommandOrder.java
incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/1.3.0/services/HUE/configuration/hue-site.xml
incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/1.3.0/services/HUE/metainfo.xml
Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1456291&r1=1456290&r2=1456291&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Thu Mar 14 00:19:47 2013
@@ -12,6 +12,9 @@ Trunk (unreleased changes):
NEW FEATURES
+ AMBARI-1585. Creating the agent scripts for Hue server installation and
+ configuration on the Hue host. (swagle)
+
AMBARI-1618. HDFS Mirroring: Create Mapper, Model, Mock Data for Cluster.
(Arun Kandregula via yusaku)
Added: incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/hue/service_check.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/hue/service_check.pp?rev=1456291&view=auto
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/hue/service_check.pp (added)
+++ incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/hue/service_check.pp Thu Mar 14 00:19:47 2013
@@ -0,0 +1,24 @@
+#
+#
+# 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.
+#
+#
+class hdp-hue::service_check() inherits hdp-hue::params
+{
+
+}
\ No newline at end of file
Added: incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/init.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/init.pp?rev=1456291&view=auto
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/init.pp (added)
+++ incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/init.pp Thu Mar 14 00:19:47 2013
@@ -0,0 +1,81 @@
+#
+#
+# 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.
+#
+#
+class hdp-hue(
+ $service_state = undef
+)
+{
+ include $hdp-hue::params
+
+ $hue_user = $hdp-hue::params::hue_server_user
+ $hue_conf_dir = $hdp::params::hue_conf_dir
+
+ if ($service_state == 'uninstalled') {
+
+ hdp::package { 'hue-server':
+ ensure => 'uninstalled'
+ }
+
+ hdp::directory { $hue_config_dir:
+ service_state => $service_state,
+ force => true
+ }
+
+ } else {
+ ## Install package
+ hdp::package { 'hue-server': }
+
+ ## Create user
+ hdp::user{ $hue_user: }
+
+ ## Create dir
+ hdp::directory_recursive_create { $hue_conf_dir:
+ service_state => $service_state,
+ force => true,
+ owner => $hue_user
+ }
+
+ # Configs generation
+ if has_key($configuration, 'hue-site') {
+ hdp-hue::generate_config_file { 'hue-ini':
+ config_file_path => $hdp-hue::params::hue_conf_file
+ }
+ }
+
+ anchor { 'hdp-hue::begin': } -> Hdp::Package['hue-server'] -> Hdp::User[$hue_user] -> Hdp::Directory_recursive_create[$hue_conf_dir] -> Hdp-Hue::Generate_config_file<||> -> anchor { 'hdp-hue::end': }
+
+ }
+}
+
+define hdp-hue::generate_config_file(
+ $config_file_path
+)
+{
+ if (hdp_is_empty($configuration) == false and
+ hdp_is_empty($configuration['hue-site']) == false)
+ {
+ ## Create hue.ini file
+ file { $config_file_path :
+ ensure => file,
+ content => template('hdp-hue/hue-ini.cfg.erb'),
+ owner => $hdp-hue::params::hue_server_user
+ }
+ }
+}
\ No newline at end of file
Added: incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/params.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/params.pp?rev=1456291&view=auto
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/params.pp (added)
+++ incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/params.pp Thu Mar 14 00:19:47 2013
@@ -0,0 +1,132 @@
+#
+#
+# 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.
+#
+#
+
+class hdp-hue::params() inherits hdp::params {
+
+ ## Global configuration properties
+
+ $hue_conf_file = "${hdp::params::hue_conf_dir}/hue.ini"
+ $hue_pid_dir = hdp_default("hue_pid_dir", "/var/run/hue")
+ $hue_log_dir = hdp_default("hue_log_dir", "/var/log/hue")
+
+ # Other properties - not exposed
+
+ $hue_hadoop_home = $hdp::params::hadoop_lib_home
+ $hue_hadoop_mapred_home = $hue_hadoop_home
+ $security_enabled = $hdp::params::security_enabled
+ $hue_hive_conf_dir = $hdp::params::hive_conf_dir
+ $hue_pig_java_home = $hdp::params::java64_home
+
+ # All non-global properties
+
+ if has_key($configuration, 'hue-site') {
+ $hue-site = $configuration['hue-site']
+
+ # Hadoop Configuration properties
+
+ $hue_hadoop_fs_defaultfs = $hue-site["fs_defaultfs"]
+ $hue_hadoop_webhdfs_url = $hue-site["webhdfs_url"]
+ $hue_hadoop_jt_host = $hue-site["jobtracker_host"]
+ $hue_hadoop_jt_port = $hue-site["jobtracker_port"]
+ $hue_hive_home_dir = $hue-site["hive_home_dir"]
+ $hue_templeton_url = $hue-site["templeton_url"]
+
+ # Database Configuration properties
+
+ $hue_db_engine = $hue-site["db_engine"]
+ $hue_db_port = $hue-site["db_port"]
+ $hue_db_host = $hue-site["db_host"]
+ $hue_db_user = $hue-site["db_user"]
+ $hue_db_password = $hue-site["db_password"]
+ $hue_db_name = $hue-site["db_name"]
+
+ # Hue Email Configuration properties
+
+ $hue_smtp_host = $hue-site["smtp_host"]
+ $hue_smtp_port = $hue-site["smtp_port"]
+ $hue_smtp_user = $hue-site["smtp_user"]
+ $hue_smtp_password = $hue-site["smtp_password"]
+ $hue_smtp_tls = $hue-site["tls"]
+ $hue_default_from_email = $hue-site["default_from_email"]
+
+ # Hue Configuration properties
+
+ $hue_debug_messages = $hue-site["send_debug_messages"]
+ $hue_database_logging = $hue-site["database_logging"]
+ $hue_secret_key = $hue-site["secret_key"]
+ $hue_http_host = $hue-site["http_host"]
+ $hue_http_port = $hue-site["http_port"]
+ $hue_time_zone = $hue-site["time_zone"]
+ $hue_django_debug_mode = $hue-site["django_debug_mode"]
+ $hue_use_cherrypy_server = $hue-site["use_cherrypy_server"]
+ $hue_http_500_debug_mode = $hue-site["http_500_debug_mode"]
+ $hue_server_user = $hue-site["server_user"]
+ $hue_server_group = $hue-site["server_group"]
+ $hue_backend_auth_policy = $hue-site["backend_auth"]
+
+ $hue_hadoop_yarn_host = $hue-site["resourcemanager_host"]
+ $hue_hadoop_yarn_port = $hue-site["resourcemanager_port"]
+
+ # Shell Configuration properties
+
+ $hue_pig_shell_command = $hue-site["pig_shell_command"]
+ $hue_hbase_nice_name = $hue-site["hbase_nice_name"]
+ $hue_hbase_shell_command = $hue-site["hbase_shell_command"]
+ $hue_bash_nice_name = $hue-site["bash_nice_name"]
+ $hue_bash_shell_command = $hue-site["bash_shell_command"]
+
+ $hue_whitelist = $hue-site["whitelist"]
+
+ } else {
+ ##TODO: Temporary intialization
+ # Hue Configuration properties
+
+ $hue_debug_messages = "1"
+ $hue_database_logging = "0"
+ $hue_secret_key = "ThisisusedforsecurehashinginthesessionstoreSetthistoarandomstringthelongerthebetter"
+ $hue_http_host = "0.0.0.0"
+ $hue_http_port = "8000"
+ $hue_time_zone = "America/Los_Angeles"
+ $hue_django_debug_mode = "1"
+ $hue_use_cherrypy_server = "false"
+ $hue_http_500_debug_mode = "1"
+ $hue_server_user = "sandbox"
+ $hue_server_group = "sandbox"
+ $hue_backend_auth_policy = "desktop.auth.backend.AllowAllBackend"
+
+ $hue_hadoop_jt_host = hdp_default("jtnode_host")
+ $webhcat_server_host = hdp_default("webhcat_server_host")
+ $hue_templeton_url = "http://${webhcat_server_host}:50111/templeton/v1"
+ $hue_hadoop_yarn_host = ""
+ $hue_hadoop_yarn_port = ""
+
+ # Shell Configuration properties
+
+ $hue_pig_shell_command = "/usr/bin/pig -l /dev/null"
+ $hue_hbase_nice_name = "HBase Shell"
+ $hue_hbase_shell_command = "/usr/bin/hbase shell"
+ $hue_bash_nice_name = "Bash (Test only!!!)"
+ $hue_bash_shell_command = "/bin/bash"
+
+ $hue_whitelist = "(localhost|127\\.0\\.0\\.1):(50030|50070|50060|50075|50111)"
+ }
+
+}
\ No newline at end of file
Added: incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/server.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/server.pp?rev=1456291&view=auto
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/server.pp (added)
+++ incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/server.pp Thu Mar 14 00:19:47 2013
@@ -0,0 +1,46 @@
+#
+# 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.
+#
+#
+class hdp-hue::server(
+ $service_state = $hdp::params::cluster_service_state,
+ $setup = false,
+ $opts = {}
+) inherits hdp-hue::params
+{
+ if ($service_state == 'no_op') {
+ } elsif ($service_state in ['running','stopped','installed_and_configured','uninstalled']) {
+ $hdp::params::service_exists['hdp-hue::server'] = true
+
+ #installs package, creates user, sets configuration
+ class{ 'hdp-hue' :
+ service_state => $service_state,
+ }
+
+ Hdp-hue::Generate_config_file<||>{ config_file_path => $hdp-hue::params::hue_conf_file }
+
+ class { 'hdp-hue::service' :
+ ensure => $service_state
+ }
+
+ #top level does not need anchors
+ Class['hdp-hue'] -> Class['hdp-hue::service']
+ } else {
+ hdp_fail("TODO not implemented yet: service_state = ${service_state}")
+ }
+}
Added: incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/service.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/service.pp?rev=1456291&view=auto
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/service.pp (added)
+++ incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/service.pp Thu Mar 14 00:19:47 2013
@@ -0,0 +1,76 @@
+#
+#
+# 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.
+#
+#
+class hdp-hue::service(
+ $ensure,
+ $initial_wait = undef
+)
+{
+ include $hdp-hue::params
+
+ $hue_user = $hdp-hue::params::hue_server_user
+ $hue_start_cmd = "/etc/init.d/hue start"
+ $hue_stop_cmd = "/etc/init.d/hue stop"
+
+ $pid_dir = $hdp-hue::params::hue_pid_dir
+ $log_dir = $hdp-hue::params::hue_log_dir
+ $pid_file = "${pid_dir}/supervisor.pid"
+ $no_op_test = "ls ${pid_file} >/dev/null 2>&1 && ps `cat ${pid_file}` >/dev/null 2>&1"
+
+ if ($ensure == 'running') {
+ $daemon_cmd = $hue_start_cmd
+ } elsif ($ensure == 'stopped') {
+ $daemon_cmd = $hue_stop_cmd
+ } else {
+ $daemon_cmd = undef
+ }
+
+ hdp-hue::service::directory { $pid_dir :
+ service_state => $ensure,
+ }
+
+ hdp-hue::service::directory { $log_dir :
+ service_state => $ensure,
+ }
+
+ anchor {'hdp-hue::service::begin': } -> Hdp-hue::Service::Directory<||> -> anchor {'hdp-hue::service::end': }
+
+ if ($daemon_cmd != undef) {
+ hdp::exec { $daemon_cmd:
+ command => $daemon_cmd,
+ unless => $no_op_test,
+ initial_wait => $initial_wait
+ }
+ Hdp-hue::Service::Directory<||> -> Hdp::Exec[$daemon_cmd] -> Anchor['hdp-hue::service::end']
+ }
+
+}
+
+define hdp-hue::service::directory(
+ $service_state
+)
+{
+ hdp::directory_recursive_create { $name:
+ owner => $hdp-hue::params::hue_server_user,
+ mode => '0755',
+ service_state => $service_state,
+ force => true
+ }
+}
\ No newline at end of file
Added: incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hue/templates/hue-ini.cfg.erb
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hue/templates/hue-ini.cfg.erb?rev=1456291&view=auto
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hue/templates/hue-ini.cfg.erb (added)
+++ incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hue/templates/hue-ini.cfg.erb Thu Mar 14 00:19:47 2013
@@ -0,0 +1,491 @@
+# 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.
+
+
+# Hue configuration file
+# ===================================
+#
+# For complete documentation about the contents of this file, run
+# $ <hue_root>/build/env/bin/hue config_help
+#
+# All .ini files under the current directory are treated equally. Their
+# contents are merged to form the Hue configuration, which can
+# can be viewed on the Hue at
+# http://<hue_host>:<port>/dump_config
+
+
+###########################################################################
+# General configuration for core Desktop features (authentication, etc)
+###########################################################################
+
+[desktop]
+
+ send_dbug_messages=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_debug_messages")%>
+
+ # To show database transactions, set database_logging to 1
+ database_logging=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_database_logging")%>
+
+ # Set this to a random string, the longer the better.
+ # This is used for secure hashing in the session store.
+ secret_key=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_secret_key")%>
+
+ # Webserver listens on this address and port
+ http_host=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_http_host")%>
+ http_port=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_http_port")%>
+
+ # Time zone name
+ time_zone=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_time_zone")%>
+
+ # Turn off debug
+ django_debug_mode=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_django_debug_mode")%>
+
+ # Turn off backtrace for server error
+ http_500_debug_mode=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_http_500_debug_mode")%>
+
+ # Server email for internal error messages
+ ## django_server_email='hue@localhost.localdomain'
+
+ # Email backend
+ ## django_email_backend=django.core.mail.backends.smtp.EmailBackend
+
+ # Set to true to use CherryPy as the webserver, set to false
+ # to use Spawning as the webserver. Defaults to Spawning if
+ # key is not specified.
+ use_cherrypy_server = <%=scope.function_hdp_template_var("::hdp-hue::params::hue_use_cherrypy_server")%>
+
+ # Webserver runs as this user
+ server_user=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_server_user")%>
+ server_group=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_server_group")%>
+
+ # If set to false, runcpserver will not actually start the web server.
+ # Used if Apache is being used as a WSGI container.
+ ## enable_server=yes
+
+ # Number of threads used by the CherryPy web server
+ #cherrypy_server_threads=2
+
+ # Filename of SSL Certificate
+ ## ssl_certificate=
+
+ # Filename of SSL RSA Private Key
+ ## ssl_private_key=
+
+ # Default encoding for site data
+ ## default_site_encoding=utf-8
+
+ # Administrators
+ # ----------------
+ [[django_admins]]
+ ## [[[admin1]]]
+ ## name=john
+ ## email=john@doe.com
+
+ # UI customizations
+ # -------------------
+ [[custom]]
+
+ # Top banner HTML code
+ ## banner_top_html=
+
+ # Configuration options for user authentication into the web application
+ # ------------------------------------------------------------------------
+ [[auth]]
+
+ # Authentication backend. Common settings are:
+ # - django.contrib.auth.backends.ModelBackend (entirely Django backend)
+ # - desktop.auth.backend.AllowAllBackend (allows everyone)
+ # - desktop.auth.backend.AllowFirstUserDjangoBackend
+ # (Default. Relies on Django and user manager, after the first login)
+ # - desktop.auth.backend.LdapBackend
+ # - desktop.auth.backend.PamBackend
+ backend=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_backend_auth_policy")%>
+
+ ## pam_service=login
+
+ # Configuration options for connecting to LDAP and Active Directory
+ # -------------------------------------------------------------------
+ [[ldap]]
+
+ # The search base for finding users and groups
+ ## base_dn="DC=mycompany,DC=com"
+
+ # The NT domain to connect to (only for use with Active Directory)
+ ## nt_domain=mycompany.com
+
+ # URL of the LDAP server
+ ## ldap_url=ldap://auth.mycompany.com
+
+ # Path to certificate for authentication over TLS
+ ## ldap_cert=
+
+ # Distinguished name of the user to bind as -- not necessary if the LDAP server
+ # supports anonymous searches
+ ## bind_dn="CN=ServiceAccount,DC=mycompany,DC=com"
+
+ # Password of the bind user -- not necessary if the LDAP server supports
+ # anonymous searches
+ ## bind_password=
+
+ # Pattern for searching for usernames -- Use <username> for the parameter
+ # For use when using LdapBackend for Hue authentication
+ ## ldap_username_pattern="uid=<username>,ou=People,dc=mycompany,dc=com"
+
+ [[[users]]]
+
+ # Base filter for searching for users
+ ## user_filter="objectclass=*"
+
+ # The username attribute in the LDAP schema
+ ## user_name_attr=sAMAccountName
+
+ [[[groups]]]
+
+ # Base filter for searching for groups
+ ## group_filter="objectclass=*"
+
+ # The username attribute in the LDAP schema
+ ## group_name_attr=cn
+
+ # Configuration options for specifying the Desktop Database. For more info,
+ # see http://docs.djangoproject.com/en/1.1/ref/settings/#database-engine
+ # ------------------------------------------------------------------------
+ [[database]]
+ # Database engine is typically one of:
+ # postgresql, mysql, sqlite3, or oracle
+ #
+ # Note that for sqlite3, 'name', below is a filename;
+ # for other backends, it is the database name.
+ engine=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_db_engine")%>
+ host=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_db_port")%>
+ port=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_db_host")%>
+ user=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_db_user")%>
+ password=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_db_password")%>
+ name=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_db_name")%>
+
+
+ # Configuration options for connecting to an external SMTP server
+ # ------------------------------------------------------------------------
+ [[smtp]]
+
+ # The SMTP server information for email notification delivery
+ host=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_smtp_host")%>
+ port=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_smtp_port")%>
+ user=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_smtp_user")%>
+ password=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_smtp_password")%>
+
+ # Whether to use a TLS (secure) connection when talking to the SMTP server
+ tls=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_smtp_tls")%>
+
+ # Default email address to use for various automated notification from Hue
+ default_from_email=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_default_from_email")%>
+
+
+ # Configuration options for Kerberos integration for secured Hadoop clusters
+ # ------------------------------------------------------------------------
+ [[kerberos]]
+
+ # Path to Hue's Kerberos keytab file
+ ## hue_keytab=
+ # Kerberos principal name for Hue
+ ## hue_principal=hue/hostname.foo.com
+ # Path to kinit
+ ## kinit_path=/path/to/kinit
+
+
+###########################################################################
+# Settings to configure your Hadoop cluster.
+###########################################################################
+
+[hadoop]
+
+ # Configuration for HDFS NameNode
+ # ------------------------------------------------------------------------
+ [[hdfs_clusters]]
+
+ [[[default]]]
+ # Enter the filesystem uri
+ fs_defaultfs=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_hadoop_fs_defaultfs")%>
+
+ # Use WebHdfs/HttpFs as the communication mechanism. To fallback to
+ # using the Thrift plugin (used in Hue 1.x), this must be uncommented
+ # and explicitly set to the empty value.
+ webhdfs_url=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_hadoop_webhdfs_url")%>
+
+ security_enabled=<%=scope.function_hdp_template_var("::hdp-hue::params::security_enabled")%>
+
+ # Settings about this HDFS cluster. If you install HDFS in a
+ # different location, you need to set the following.
+
+ # Defaults to $HADOOP_HDFS_HOME or /usr/lib/hadoop-hdfs
+ hadoop_hdfs_home=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_hadoop_home")%>
+
+ # Defaults to $HADOOP_BIN or /usr/bin/hadoop
+ ## hadoop_bin=/usr/bin/hadoop
+
+ # Defaults to $HADOOP_CONF_DIR or /etc/hadoop/conf
+ ## hadoop_conf_dir=/etc/hadoop/conf
+
+ # Configuration for MapReduce JobTracker
+ # ------------------------------------------------------------------------
+ [[mapred_clusters]]
+
+ [[[default]]]
+ # Enter the host on which you are running the Hadoop JobTracker
+ jobtracker_host=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_hadoop_jt_host")%>
+ # The port where the JobTracker IPC listens on
+ jobtracker_port=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_hadoop_jt_port")%>
+ # Thrift plug-in port for the JobTracker
+ ## thrift_port=9290
+ # Whether to submit jobs to this cluster
+ ## submit_to=False
+
+ ## security_enabled=false
+
+ # Settings about this MR1 cluster. If you install MR1 in a
+ # different location, you need to set the following.
+
+ # Defaults to $HADOOP_MR1_HOME or /usr/lib/hadoop-0.20-mapreduce
+ hadoop_mapred_home=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_hadoop_mapred_home")%>
+
+ # Defaults to $HADOOP_BIN or /usr/bin/hadoop
+ ## hadoop_bin=/usr/bin/hadoop
+
+ # Defaults to $HADOOP_CONF_DIR or /etc/hadoop/conf
+ ## hadoop_conf_dir=/etc/hadoop/conf
+
+ # Configuration for Yarn
+ # ------------------------------------------------------------------------
+ [[yarn_clusters]]
+
+ [[[default]]]
+ # Enter the host on which you are running the ResourceManager
+ resourcemanager_host=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_hadoop_yarn_host")%>
+ # The port where the ResourceManager IPC listens on
+ resourcemanager_port=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_hadoop_yarn_port")%>
+ # Whether to submit jobs to this cluster
+ ## submit_to=False
+
+ ## security_enabled=false
+
+ # Settings about this MR2 cluster. If you install MR2 in a
+ # different location, you need to set the following.
+
+ # Defaults to $HADOOP_MR2_HOME or /usr/lib/hadoop-mapreduce
+ hadoop_mapred_home=/usr/lib/hadoop/lib
+
+ # Defaults to $HADOOP_BIN or /usr/bin/hadoop
+ ## hadoop_bin=/usr/bin/hadoop
+
+ # Defaults to $HADOOP_CONF_DIR or /etc/hadoop/conf
+ ## hadoop_conf_dir=/etc/hadoop/conf
+
+
+###########################################################################
+# Settings to configure liboozie
+###########################################################################
+
+[liboozie]
+ # The URL where the Oozie service runs on. This is required in order for
+ # users to submit jobs.
+ ## oozie_url=http://localhost:11000/oozie
+
+ ## security_enabled=false
+
+ # Location on HDFS where the workflows/coordinator are deployed when submitted.
+ ## remote_deployement_dir=/user/hue/oozie/deployments
+
+
+###########################################################################
+# Settings to configure the Oozie app
+###########################################################################
+
+[oozie]
+ # Location on local FS where the examples are stored.
+ ## local_data_dir=..../examples
+
+ # Location on local FS where the data for the examples is stored.
+ ## sample_data_dir=...thirdparty/sample_data
+
+ # Location on HDFS where the oozie examples and workflows are stored.
+ ## remote_data_dir=/user/hue/oozie/workspaces
+
+ # Share workflows and coordinators information with all users. If set to false,
+ # they will be visible only to the owner and administrators.
+ ## share_jobs=True
+
+ # Maximum of Oozie workflows or coodinators to retrieve in one API call.
+ ## oozie_jobs_count=100
+
+
+###########################################################################
+# Settings to configure Beeswax
+###########################################################################
+
+[beeswax]
+
+ # Deprecated! Will be removed in Hue 3
+ # Multiple sections are now available in query_servers
+ # Host where Beeswax internal metastore Thrift daemon is running
+ ## beeswax_meta_server_host=localhost
+
+ # Deprecated! Will be removed in Hue 3
+ # Multiple sections are now available in query_servers
+ # Configure the port the internal metastore daemon runs on. Used only if
+ # hive.metastore.local is true.
+ ## beeswax_meta_server_port=8003
+
+ # Host where Beeswax internal metastore Thrift daemon is running
+ ## beeswax_meta_server_host=localhost
+
+ # Configure the port the internal metastore daemon runs on. Used only if
+ # hive.metastore.local is true.
+ ## beeswax_meta_server_port=8003
+
+ # Hive home directory
+ hive_home_dir=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_hive_home_dir")%>
+
+ # Hive configuration directory, where hive-site.xml is located
+ hive_conf_dir=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_hive_conf_dir")%>
+
+ # Timeout in seconds for thrift calls to beeswax service
+ ## beeswax_server_conn_timeout=120
+
+ # Timeout in seconds for thrift calls to the hive metastore
+ ## metastore_conn_timeout=10
+
+ # Maximum Java heapsize (in megabytes) used by Beeswax Server.
+ # Note that the setting of HADOOP_HEAPSIZE in $HADOOP_CONF_DIR/hadoop-env.sh
+ # may override this setting.
+ ## beeswax_server_heapsize=1000
+
+ # Share saved queries with all users. If set to false, saved queries are
+ # visible only to the owner and administrators.
+ ## share_saved_queries=true
+
+ # One entry for each Query Server that can execute some SQL queries.
+ # This must be in the bottom of the [beewax] section.
+ [[query_servers]]
+
+ [[[default]]]
+ # Host where the Query Server Thrift daemon is running
+ ## server_host=localhost
+ # Configure the port the Query Server Thrift server
+ ## server_port=8002
+ # If DDL queries are supported (e.g. DROP can be sent directly to this server)
+ ## support_ddl=True
+
+###########################################################################
+# Settings to configure Job Designer
+###########################################################################
+
+[jobsub]
+ # Location on HDFS where the jobsub examples and templates are stored.
+ ## remote_data_dir=/user/hue/jobsub
+
+ # Location on local FS where examples and template are stored.
+ ## local_data_dir=..../data
+
+ # Location on local FS where sample data is stored
+ ## sample_data_dir=...thirdparty/sample_data
+
+
+###########################################################################
+# Settings to configure Job Browser
+###########################################################################
+
+[jobbrowser]
+ # Share submitted jobs information with all users. If set to false,
+ # submitted jobs are visible only to the owner and administrators.
+ ## share_jobs=true
+
+
+###########################################################################
+# Settings to configure the Shell application
+###########################################################################
+
+[shell]
+ # The shell_buffer_amount specifies the number of bytes of output per shell
+ # that the Shell app will keep in memory. If not specified, it defaults to
+ # 524288 (512 MiB).
+ ## shell_buffer_amount=100
+
+ # If you run Hue against a Hadoop cluster with Kerberos security enabled, the
+ # Shell app needs to acquire delegation tokens for the subprocesses to work
+ # correctly. These delegation tokens are stored as temporary files in some
+ # directory. You can configure this directory here. If not specified, it
+ # defaults to /tmp/hue_delegation_tokens.
+ ## shell_delegation_token_dir=/tmp/hue_delegation_tokens
+
+ [[ shelltypes ]]
+
+ # Define and configure a new shell type "flume"
+ # ------------------------------------------------------------------------
+ #[[[ flume ]]]
+ # nice_name = "Flume Shell"
+ # command = "/usr/bin/flume shell"
+ # help = "The command-line Flume client interface."
+
+ # [[[[ environment ]]]]
+ # You can specify environment variables for the Flume shell
+ # in this section.
+
+ # Define and configure a new shell type "pig"
+ # ------------------------------------------------------------------------
+ [[[ pig ]]]
+ nice_name = "Pig Shell (Grunt)"
+ command = <%=scope.function_hdp_template_var("::hdp-hue::params::hue_pig_shell_command")%>
+ help = "The command-line interpreter for Pig"
+
+ [[[[ environment ]]]]
+ # You can specify environment variables for the Pig shell
+ # in this section. Note that JAVA_HOME must be configured
+ # for the Pig shell to run.
+
+ [[[[[ JAVA_HOME ]]]]]
+ value = <%=scope.function_hdp_template_var("::hdp-hue::params::hue_pig_java_home")%>
+
+ # Define and configure a new shell type "hbase"
+ # ------------------------------------------------------------------------
+ [[[ hbase ]]]
+ nice_name = "HBase Shell"
+ command = <%=scope.function_hdp_template_var("::hdp-hue::params::hue_hbase_shell_command")%>
+ help = "The command-line HBase client interface."
+
+ [[[[ environment ]]]]
+ # You can configure environment variables for the HBase shell
+ # in this section.
+
+ # Define and configure a new shell type "bash" for testing only
+ # ------------------------------------------------------------------------
+ [[[ bash ]]]
+ nice_name = "Bash (Test only!!!)"
+ command = <%=scope.function_hdp_template_var("::hdp-hue::params::hue_bash_shell_command")%>
+ help = "A shell that does not depend on Hadoop components"
+
+
+###########################################################################
+# Settings for the User Admin application
+###########################################################################
+
+[useradmin]
+ # The name of the default user group that users will be a member of
+ ## default_user_group=default
+
+[hcatalog]
+ templeton_url=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_templeton_url")
+
+[proxy]
+whitelist=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_whitelist")%>
Modified: incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp?rev=1456291&r1=1456290&r2=1456291&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp (original)
+++ incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp Thu Mar 14 00:19:47 2013
@@ -334,7 +334,10 @@ class hdp::params()
},
ambari-log4j => {
64 => ['ambari-log4j']
- }
+ },
+ hue-server => {
+ 64 => ['sandbox-hue-bin-1.2.1']
+ }
}
$packages = 'bigtop'
if ($packages == 'hdp') {
@@ -362,6 +365,7 @@ class hdp::params()
$hcat_server_host = hdp_default("hcat_server_host")
$hcat_mysql_host = hdp_default("hcat_mysql_host")
+ $hue_conf_dir = "/etc/hue/conf"
} elsif ($packages == 'bigtop') {
@@ -395,7 +399,7 @@ class hdp::params()
$hcat_server_host = hdp_default("hive_server_host")
$hcat_mysql_host = hdp_default("hive_mysql_host")
-
+ $hue_conf_dir = "/etc/hue/conf"
$pathes = {
@@ -579,6 +583,10 @@ class hdp::params()
}
},
+ hue-server => {
+ 64 => {'ALL' => 'sandbox-hue-bin-1.2.1'}
+ },
+
ambari-log4j => {
64 => {'ALL' =>'ambari-log4j'}
},
@@ -586,7 +594,6 @@ class hdp::params()
64 => {'ALL' =>'httpd',
suse => ['apache2', 'apache2-mod_php5']}
}
-
}
Modified: incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py?rev=1456291&r1=1456290&r2=1456291&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py (original)
+++ incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py Thu Mar 14 00:19:47 2013
@@ -106,6 +106,7 @@ rolesToClass = {
'GANGLIA_SERVER': 'hdp-ganglia::server',
'GANGLIA_MONITOR': 'hdp-ganglia::monitor',
'HTTPD': 'hdp-monitor-webserver',
+ 'HUE_SERVER': 'hdp-hue::server',
'HDFS_SERVICE_CHECK': 'hdp-hadoop::hdfs::service_check',
'MAPREDUCE_SERVICE_CHECK': 'hdp-hadoop::mapred::service_check',
'ZOOKEEPER_SERVICE_CHECK': 'hdp-zookeeper::zookeeper::service_check',
@@ -118,7 +119,8 @@ rolesToClass = {
'SQOOP_SERVICE_CHECK': 'hdp-sqoop::sqoop::service_check',
'WEBHCAT_SERVICE_CHECK': 'hdp-templeton::templeton::service_check',
'DASHBOARD_SERVICE_CHECK': 'hdp-dashboard::dashboard::service_check',
- 'DECOMMISSION_DATANODE': 'hdp-hadoop::hdfs::decommission'
+ 'DECOMMISSION_DATANODE': 'hdp-hadoop::hdfs::decommission',
+ 'HUE_SERVICE_CHECK': 'hdp-hue::service_check'
}
serviceStates = {
Modified: incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/manifestGenerator.py
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/manifestGenerator.py?rev=1456291&r1=1456290&r2=1456291&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/manifestGenerator.py (original)
+++ incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/manifestGenerator.py Thu Mar 14 00:19:47 2013
@@ -34,7 +34,7 @@ non_global_configuration_types = ["hdfs-
"hadoop-policy", "mapred-site",
"capacity-scheduler", "hbase-site",
"hbase-policy", "hive-site", "oozie-site",
- "webhcat-site", "hdfs-exclude-file"]
+ "webhcat-site", "hdfs-exclude-file", "hue-site"]
#read static imports from file and write them to manifest
def writeImports(outputFile, modulesdir, importsList):
Modified: incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/metadata/RoleCommandOrder.java
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/metadata/RoleCommandOrder.java?rev=1456291&r1=1456290&r2=1456291&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/metadata/RoleCommandOrder.java (original)
+++ incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/metadata/RoleCommandOrder.java Thu Mar 14 00:19:47 2013
@@ -122,7 +122,7 @@ public class RoleCommandOrder {
RoleCommand.START);
addDependency(Role.HUE_SERVER, RoleCommand.START, Role.HIVE_SERVER,
RoleCommand.START);
- addDependency(Role.HUE_SERVER, RoleCommand.START, Role.HIVE_METASTORE,
+ addDependency(Role.HUE_SERVER, RoleCommand.START, Role.HCAT,
RoleCommand.START);
addDependency(Role.HUE_SERVER, RoleCommand.START, Role.OOZIE_SERVER,
RoleCommand.START);
Modified: incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/1.3.0/services/HUE/configuration/hue-site.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/1.3.0/services/HUE/configuration/hue-site.xml?rev=1456291&r1=1456290&r2=1456291&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/1.3.0/services/HUE/configuration/hue-site.xml (original)
+++ incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/1.3.0/services/HUE/configuration/hue-site.xml Thu Mar 14 00:19:47 2013
@@ -20,21 +20,21 @@
<configuration>
<!-- General Hue server configuration properties -->
<property>
- <name>send_dbug_messages</name>
+ <name>send_debug_messages</name>
<value>1</value>
<description></description>
</property>
<property>
<name>database_logging</name>
- <value>0 </value>
- <description>To show database transactions, set database_logging to 1
- database_logging=0</description>
+ <value>0</value>
+ <description>To show database transactions, set database_logging to 1.
+ default, database_logging=0</description>
</property>
<property>
<name>secret_key</name>
- <value>ThisisusedforsecurehashinginthesessionstoreSetthistoarandomstringthelongerthebetter</value>
+ <value></value>
<description>This is used for secure hashing in the session store.</description>
</property>
@@ -78,18 +78,18 @@
<property>
<name>server_user</name>
- <value>sandbox</value>
+ <value></value>
<description>Webserver runs as this user</description>
</property>
<property>
<name>server_group</name>
- <value>sandbox</value>
+ <value></value>
<description>Webserver runs as this user</description>
</property>
<property>
- <name>backend</name>
+ <name>backend_auth_policy</name>
<value>desktop.auth.backend.AllowAllBackend</value>
<description>Authentication backend.</description>
</property>
@@ -145,20 +145,26 @@
</property>
<property>
- <name>tls</name>
- <value>no</value>
- <description>Whether to use a TLS (secure) connection when talking to the SMTP server.</description>
+ <name>smtp_user</name>
+ <value></value>
+ <description>The SMTP server information for email notification delivery.</description>
</property>
<property>
- <name>default_from_email</name>
- <value>sandbox@hortonworks.com</value>
+ <name>smtp_password</name>
+ <value>25</value>
<description>The SMTP server information for email notification delivery.</description>
</property>
<property>
<name>tls</name>
- <value>25</value>
+ <value>no</value>
+ <description>Whether to use a TLS (secure) connection when talking to the SMTP server.</description>
+ </property>
+
+ <property>
+ <name>default_from_email</name>
+ <value>sandbox@hortonworks.com</value>
<description>The SMTP server information for email notification delivery.</description>
</property>
@@ -180,19 +186,6 @@
</property>
<property>
- <name>hdfs_security_enabled</name>
- <value>false</value>
- <description>Is Kerberos security enabled.</description>
- </property>
-
- <property>
- <name>hadoop_hdfs_home</name>
- <value>/usr/lib/hadoop/lib</value>
- <description>Defaults to $HADOOP_HDFS_HOME or
- /usr/lib/hadoop-hdfs.</description>
- </property>
-
- <property>
<name>jobtracker_host</name>
<value></value>
<description>Enter the host on which you are running the Hadoop JobTracker.</description>
@@ -218,28 +211,34 @@
<property>
<name>resourcemanager_port</name>
- <value>8032</value>
+ <value></value>
<description>The port where the ResourceManager IPC listens on.</description>
</property>
<!-- Hue Beeswax configuration properties -->
<property>
<name>hive_home_dir</name>
- <value>/home/sandbox/hive</value>
+ <value></value>
<description>Hive home directory.</description>
</property>
<property>
<name>hive_conf_dir</name>
- <value>/home/sandbox/hive/conf</value>
+ <value></value>
<description>Hive configuration directory, where hive-site.xml is
located.</description>
</property>
+ <property>
+ <name>templeton_url</name>
+ <value></value>
+ <description>WebHcat http URL</description>
+ </property>
+
<!-- Hue shell types configuration -->
<property>
<name>pig_nice_name</name>
- <value>Pig Shell (Grunt)</value>
+ <value></value>
<description>Define and configure a new shell type pig</description>
</property>
@@ -269,7 +268,7 @@
<property>
<name>bash_nice_name</name>
- <value>Bash (Test only!!!)</value>
+ <value></value>
<description>Define and configure a new shell type bash for testing
only</description>
</property>
Modified: incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/1.3.0/services/HUE/metainfo.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/1.3.0/services/HUE/metainfo.xml?rev=1456291&r1=1456290&r2=1456291&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/1.3.0/services/HUE/metainfo.xml (original)
+++ incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/1.3.0/services/HUE/metainfo.xml Thu Mar 14 00:19:47 2013
@@ -23,8 +23,8 @@
<components>
<component>
- <name>HUE</name>
- <category>SERVER</category>
+ <name>HUE_SERVER</name>
+ <category>MASTER</category>
</component>
</components>