[ambari] - update to 1.5.1 (HDP build 110);- enable agent build
Peter MacKinnon
pmackinn at fedoraproject.org
Fri Apr 25 14:49:22 UTC 2014
commit 937533d60a69a29a8fb859b231d288543faa4297
Author: Peter MacKinnon <pmackinn at redhat.com>
Date: Fri Apr 25 10:48:53 2014 -0400
- update to 1.5.1 (HDP build 110);- enable agent build
.gitignore | 1 +
ambari-AMBARI-3567-ambari-web-public.patch | 66 -
ambari-jetty7-8-mods.patch | 72 +-
ambari-jpa-nullable-adjustment.patch | 35 +
ambari-os-lookup.patch | 56 -
ambari-puppet-syntax-remove-hyphens.patch | 2110 ++++++++++++++++++++++++++++
ambari-static-web-profile.patch | 38 -
ambari.spec | 100 +-
sources | 2 +-
9 files changed, 2226 insertions(+), 254 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 900b978..8ccd12c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/ambari-1.4.4.tar.gz
+/ambari-1.5.1.tar.gz
diff --git a/ambari-jetty7-8-mods.patch b/ambari-jetty7-8-mods.patch
index aa39dab..aa1b54c 100644
--- a/ambari-jetty7-8-mods.patch
+++ b/ambari-jetty7-8-mods.patch
@@ -1,77 +1,35 @@
-From 56cff7ec5ace3ea5a140890ee3caee04412e67df Mon Sep 17 00:00:00 2001
+From 75c996508ef9050527ddf9a42da8bbc176faedfb Mon Sep 17 00:00:00 2001
From: Peter MacKinnon <pmackinn at redhat.com>
-Date: Sat, 22 Feb 2014 04:20:38 +0000
-Subject: [PATCH 7/8] initial jetty7->8 mods
+Date: Tue, 22 Apr 2014 16:36:24 -0400
+Subject: [PATCH] jetty 7->8 fixup
---
- ambari-project/pom.xml | 9 +++++----
- .../org/apache/ambari/server/controller/AmbariServer.java | 13 ++++++++-----
- 2 files changed, 13 insertions(+), 9 deletions(-)
+ .../apache/ambari/server/controller/AmbariServer.java | 17 ++++++++++-------
+ 1 file changed, 10 insertions(+), 7 deletions(-)
-diff --git a/ambari-project/pom.xml b/ambari-project/pom.xml
-index 426a074..c9417c8 100644
---- a/ambari-project/pom.xml
-+++ b/ambari-project/pom.xml
-@@ -27,6 +27,7 @@
- <packaging>pom</packaging>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-+ <jetty.version>8.1.14.v20131031</jetty.version>
- </properties>
- <pluginRepositories>
- <pluginRepository>
-@@ -216,22 +217,22 @@
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
-- <version>7.6.7.v20120910</version>
-+ <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-security</artifactId>
-- <version>7.6.7.v20120910</version>
-+ <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlet</artifactId>
-- <version>7.6.7.v20120910</version>
-+ <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-webapp</artifactId>
-- <version>7.6.7.v20120910</version>
-+ <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
-index 133871b..55b5238 100644
+index 034e877..1ff17c0 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
-@@ -22,8 +22,10 @@ package org.apache.ambari.server.controller;
+@@ -22,6 +22,8 @@ package org.apache.ambari.server.controller;
import java.io.File;
import java.net.BindException;
import java.util.Map;
+import java.util.EnumSet;
++import javax.servlet.DispatcherType;
import javax.crypto.BadPaddingException;
-+import javax.servlet.DispatcherType;
- import org.apache.ambari.eventdb.webservice.WorkflowJsonService;
- import org.apache.ambari.server.AmbariException;
-@@ -61,6 +63,7 @@ import org.eclipse.jetty.server.Connector;
- import org.eclipse.jetty.server.Server;
+@@ -75,6 +77,7 @@ import org.eclipse.jetty.server.Server;
+ import org.eclipse.jetty.server.handler.HandlerList;
import org.eclipse.jetty.server.nio.SelectChannelConnector;
import org.eclipse.jetty.server.ssl.SslSelectChannelConnector;
+import org.eclipse.jetty.server.session.AbstractSessionManager;
import org.eclipse.jetty.servlet.DefaultServlet;
import org.eclipse.jetty.servlet.FilterHolder;
import org.eclipse.jetty.servlet.ServletContextHandler;
-@@ -156,7 +159,7 @@ public class AmbariServer {
- ServletContextHandler.SECURITY | ServletContextHandler.SESSIONS);
+@@ -181,7 +184,7 @@ public class AmbariServer {
+ root.setErrorHandler(injector.getInstance(AmbariErrorHandler.class));
//Changing session cookie name to avoid conflicts
- root.getSessionHandler().getSessionManager().setSessionCookie("AMBARISESSIONID");
@@ -79,13 +37,15 @@ index 133871b..55b5238 100644
GenericWebApplicationContext springWebAppContext = new GenericWebApplicationContext();
springWebAppContext.setServletContext(root.getServletContext());
-@@ -185,13 +188,13 @@ public class AmbariServer {
+@@ -210,15 +213,15 @@ public class AmbariServer {
springSecurityFilter.setTargetBeanName("springSecurityFilterChain");
//session-per-request strategy for api and agents
- root.addFilter(new FilterHolder(injector.getInstance(AmbariPersistFilter.class)), "/api/*", 1);
+- root.addFilter(new FilterHolder(injector.getInstance(AmbariPersistFilter.class)), "/proxy/*", 1);
- agentroot.addFilter(new FilterHolder(injector.getInstance(AmbariPersistFilter.class)), "/agent/*", 1);
+ root.addFilter(new FilterHolder(injector.getInstance(AmbariPersistFilter.class)), "/api/*", EnumSet.of(DispatcherType.REQUEST));
++ root.addFilter(new FilterHolder(injector.getInstance(AmbariPersistFilter.class)), "/proxy/*", EnumSet.of(DispatcherType.REQUEST));
+ agentroot.addFilter(new FilterHolder(injector.getInstance(AmbariPersistFilter.class)), "/agent/*", EnumSet.of(DispatcherType.REQUEST));
- agentroot.addFilter(SecurityFilter.class, "/*", 1);
@@ -93,7 +53,9 @@ index 133871b..55b5238 100644
if (configs.getApiAuthentication()) {
- root.addFilter(new FilterHolder(springSecurityFilter), "/api/*", 1);
+- root.addFilter(new FilterHolder(springSecurityFilter), "/proxy/*", 1);
+ root.addFilter(new FilterHolder(springSecurityFilter), "/api/*", EnumSet.of(DispatcherType.REQUEST));
++ root.addFilter(new FilterHolder(springSecurityFilter), "/proxy/*", EnumSet.of(DispatcherType.REQUEST));
}
diff --git a/ambari-jpa-nullable-adjustment.patch b/ambari-jpa-nullable-adjustment.patch
new file mode 100644
index 0000000..b1ad586
--- /dev/null
+++ b/ambari-jpa-nullable-adjustment.patch
@@ -0,0 +1,35 @@
+From d1d36762c4f588329d004d1ebf07b92551317949 Mon Sep 17 00:00:00 2001
+From: Peter MacKinnon <pmackinn at redhat.com>
+Date: Tue, 22 Apr 2014 20:38:01 -0400
+Subject: [PATCH] jpa nullable adjustment
+
+---
+ .../java/com/google/inject/persist/jpa/AmbariJpaPersistService.java | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/ambari-server/src/main/java/com/google/inject/persist/jpa/AmbariJpaPersistService.java b/ambari-server/src/main/java/com/google/inject/persist/jpa/AmbariJpaPersistService.java
+index 1f10d43..116fb4c 100644
+--- a/ambari-server/src/main/java/com/google/inject/persist/jpa/AmbariJpaPersistService.java
++++ b/ambari-server/src/main/java/com/google/inject/persist/jpa/AmbariJpaPersistService.java
+@@ -19,7 +19,8 @@ package com.google.inject.persist.jpa;
+
+
+ import com.google.inject.Inject;
+-import com.google.inject.internal.util.$Nullable;
++import com.google.inject.Provider;
++import javax.annotation.Nullable;
+
+ import java.util.Properties;
+
+@@ -29,7 +30,7 @@ import java.util.Properties;
+ public class AmbariJpaPersistService extends JpaPersistService {
+
+ @Inject
+- public AmbariJpaPersistService(@Jpa String persistenceUnitName, @$Nullable @Jpa Properties persistenceProperties) {
++ public AmbariJpaPersistService(@Jpa String persistenceUnitName, @Nullable @Jpa Provider<Properties> persistenceProperties) {
+ super(persistenceUnitName, persistenceProperties);
+ }
+
+--
+1.9.0
+
diff --git a/ambari-puppet-syntax-remove-hyphens.patch b/ambari-puppet-syntax-remove-hyphens.patch
new file mode 100644
index 0000000..dce43f4
--- /dev/null
+++ b/ambari-puppet-syntax-remove-hyphens.patch
@@ -0,0 +1,2110 @@
+diff --git a/ambari-agent/src/main/puppet/modules/hdp-dashboard/manifests/init.pp b/ambari-agent/src/main/puppet/modules/hdp-dashboard/manifests/init.pp
+index 0770252..dd17bdb 100644
+--- a/ambari-agent/src/main/puppet/modules/hdp-dashboard/manifests/init.pp
++++ b/ambari-agent/src/main/puppet/modules/hdp-dashboard/manifests/init.pp
+@@ -42,7 +42,7 @@ class hdp-dashboard(
+ java_needed => 'false',
+ size => 64
+ }
+- $conf_dir = $hdp-dashboard::params::conf_dir
++ $conf_dir = $hdp_dashboard::params::conf_dir
+
+ hdp::directory_recursive_create { $conf_dir :
+ service_state => $service_state,
+diff --git a/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/config.pp b/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/config.pp
+index bf69f51..2bc0f6f 100644
+--- a/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/config.pp
++++ b/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/config.pp
+@@ -25,7 +25,7 @@ class hdp-ganglia::config(
+ {
+ if ($service_state in ['running','installed_and_configured','stopped']) {
+ #TODO: divide into what is needed on server vs what is needed on monitored nodes
+- $shell_cmds_dir = $hdp-ganglia::params::ganglia_shell_cmds_dir
++ $shell_cmds_dir = $hdp_ganglia::params::ganglia_shell_cmds_dir
+ $shell_files = ['checkGmond.sh','checkRrdcached.sh','gmetadLib.sh','gmondLib.sh','rrdcachedLib.sh' ,'setupGanglia.sh','startGmetad.sh','startGmond.sh','startRrdcached.sh','stopGmetad.sh','stopGmond.sh','stopRrdcached.sh','teardownGanglia.sh']
+
+ hdp::directory_recursive_create { $shell_cmds_dir :
+diff --git a/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/config/generate_daemon.pp b/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/config/generate_daemon.pp
+index 1718cb8..2c2936f 100755
+--- a/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/config/generate_daemon.pp
++++ b/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/config/generate_daemon.pp
+@@ -26,7 +26,7 @@ define hdp-ganglia::config::generate_daemon(
+ $group = $hdp::params::user_group
+ )
+ {
+- $shell_cmds_dir = $hdp-ganglia::params::ganglia_shell_cmds_dir
++ $shell_cmds_dir = $hdp_ganglia::params::ganglia_shell_cmds_dir
+ $cmd = $ganglia_service ? {
+ 'gmond' => $role ? {
+ 'server' => "${shell_cmds_dir}/setupGanglia.sh -c ${name} -m -o ${owner} -g ${group}",
+diff --git a/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/init.pp b/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/init.pp
+index 2c98355..5738344 100644
+--- a/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/init.pp
++++ b/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/init.pp
+@@ -24,8 +24,8 @@ class hdp-ganglia(
+ {
+ if ! ($service_state in ['no_op', 'uninstalled']) {
+ include hdp-ganglia::params
+- $gmetad_user = $hdp-ganglia::params::gmetad_user
+- $gmond_user = $hdp-ganglia::params::gmond_user
++ $gmetad_user = $hdp_ganglia::params::gmetad_user
++ $gmond_user = $hdp_ganglia::params::gmond_user
+
+ hdp::group { 'gmetad_group' :
+ group_name => $gmetad_user,
+diff --git a/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/monitor_and_server.pp b/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/monitor_and_server.pp
+index 418c4cb..6620eea 100644
+--- a/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/monitor_and_server.pp
++++ b/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/monitor_and_server.pp
+@@ -23,9 +23,9 @@ class hdp-ganglia::monitor_and_server(
+ $opts = {}
+ ) inherits hdp-ganglia::params
+ {
+- $ganglia_shell_cmds_dir = $hdp-ganglia::params::ganglia_shell_cmds_dir
+- $ganglia_conf_dir = $hdp-ganglia::params::ganglia_conf_dir
+- $ganglia_runtime_dir = $hdp-ganglia::params::ganglia_runtime_dir
++ $ganglia_shell_cmds_dir = $hdp_ganglia::params::ganglia_shell_cmds_dir
++ $ganglia_conf_dir = $hdp_ganglia::params::ganglia_conf_dir
++ $ganglia_runtime_dir = $hdp_ganglia::params::ganglia_runtime_dir
+
+ #note: includes the common package ganglia-monitor
+ class { 'hdp-ganglia':
+diff --git a/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/server.pp b/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/server.pp
+index 7dca30c..c732eb4 100644
+--- a/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/server.pp
++++ b/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/server.pp
+@@ -184,9 +184,9 @@ class hdp-ganglia::server::files(
+
+ anchor{ 'hdp-ganglia::server::files::begin' : } -> Hdp::Directory_recursive_create[$rrd_py_path] -> File[$rrd_py_file_path] -> anchor{ 'hdp-ganglia::server::files::end' : }
+
+- $rrd_files_dir = $hdp-ganglia::params::rrdcached_base_dir
+- $rrd_file_owner = $hdp-ganglia::params::gmetad_user
+- $rrdcached_default_file_dir = $hdp-ganglia::params::rrdcached_default_base_dir
++ $rrd_files_dir = $hdp_ganglia::params::rrdcached_base_dir
++ $rrd_file_owner = $hdp_ganglia::params::gmetad_user
++ $rrdcached_default_file_dir = $hdp_ganglia::params::rrdcached_default_base_dir
+
+ ## If directory is different fr omdefault make sure it exists
+ if ($rrdcached_default_file_dir != $rrd_files_dir) {
+@@ -227,7 +227,7 @@ class hdp-ganglia::service::change_permission(
+ if ($ensure == 'running' or $ensure == 'installed_and_configured') {
+ hdp::directory_recursive_create { '/var/lib/ganglia/dwoo' :
+ mode => '0777',
+- owner => $hdp-ganglia::params::gmetad_user
++ owner => $hdp_ganglia::params::gmetad_user
+ }
+ }
+ }
+diff --git a/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/datanode.pp b/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/datanode.pp
+index 04a0d8e..d2d478d 100644
+--- a/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/datanode.pp
++++ b/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/datanode.pp
+@@ -38,7 +38,7 @@ class hdp-hadoop::datanode(
+
+ if ($service_state == 'no_op') {
+ } elsif ($service_state in ['running','stopped','installed_and_configured','uninstalled']) {
+- $dfs_data_dir = $hdp-hadoop::params::dfs_data_dir
++ $dfs_data_dir = $hdp_hadoop::params::dfs_data_dir
+
+ if (($hdp::params::service_exists['hdp-hadoop::namenode'] == true) or ($hdp::params::service_exists['hdp-hadoop::snamenode'] == true)){
+ $a_namenode_on_node = true
+@@ -56,7 +56,7 @@ class hdp-hadoop::datanode(
+ masterhost => $masterHost,
+ keytabdst => "${$keytab_path}/dn.service.keytab",
+ keytabfile => 'dn.service.keytab',
+- owner => $hdp-hadoop::params::hdfs_user
++ owner => $hdp_hadoop::params::hdfs_user
+ }
+ }
+
+@@ -75,7 +75,7 @@ class hdp-hadoop::datanode(
+
+ hdp-hadoop::service{ 'datanode':
+ ensure => $service_state,
+- user => $hdp-hadoop::params::hdfs_user,
++ user => $hdp_hadoop::params::hdfs_user,
+ create_pid_dir => $create_pid_dir,
+ create_log_dir => $create_log_dir
+ }
+@@ -91,7 +91,7 @@ define hdp-hadoop::datanode::create_data_dirs($service_state)
+ {
+ $dirs = hdp_array_from_comma_list($name)
+ hdp::directory_recursive_create_ignore_failure { $dirs :
+- owner => $hdp-hadoop::params::hdfs_user,
++ owner => $hdp_hadoop::params::hdfs_user,
+ mode => '0750',
+ service_state => $service_state,
+ force => true
+diff --git a/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/hdfs/directory.pp b/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/hdfs/directory.pp
+index f0852ae..f722109 100644
+--- a/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/hdfs/directory.pp
++++ b/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/hdfs/directory.pp
+@@ -32,15 +32,15 @@ define hdp-hadoop::hdfs::directory(
+ $namenode_safe_mode_off = "hadoop dfsadmin -safemode get|grep 'Safe mode is OFF'"
+
+ # Short circuit the expensive dfs client checks if directory was already created
+- $stub_dir = $hdp-hadoop::params::namenode_dirs_created_stub_dir
+- $stub_filename = $hdp-hadoop::params::namenode_dirs_stub_filename
++ $stub_dir = $hdp_hadoop::params::namenode_dirs_created_stub_dir
++ $stub_filename = $hdp_hadoop::params::namenode_dirs_stub_filename
+ $dir_absent_in_stub = "grep -q '^${name}$' ${stub_dir}/${stub_filename} > /dev/null 2>&1; test $? -ne 0"
+ $record_dir_in_stub = "echo '${name}' >> ${stub_dir}/${stub_filename}"
+ $tries = 30
+ $try_sleep = 10
+
+ if ($hdp::params::dfs_ha_enabled == true) {
+- $namenode_id = $hdp-hadoop::params::namenode_id
++ $namenode_id = $hdp_hadoop::params::namenode_id
+ if (hdp_is_empty($namenode_id) == false) {
+ $dfs_check_nn_status_cmd = "hdfs haadmin -getServiceState $namenode_id | grep active > /dev/null"
+ }
+@@ -65,7 +65,7 @@ define hdp-hadoop::hdfs::directory(
+
+ hdp::exec { $record_dir_in_stub:
+ command => $record_dir_in_stub,
+- user => $hdp-hadoop::params::hdfs_user,
++ user => $hdp_hadoop::params::hdfs_user,
+ onlyif => $dir_absent_in_stub
+ }
+
+diff --git a/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/init.pp b/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/init.pp
+index 8389bd2..0aeb427 100644
+--- a/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/init.pp
++++ b/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/init.pp
+@@ -43,64 +43,64 @@ class hdp-hadoop::initialize()
+
+ if has_key($configuration, 'mapred-queue-acls') {
+ configgenerator::configfile{'mapred-queue-acls':
+- modulespath => $hdp-hadoop::params::conf_dir,
++ modulespath => $hdp_hadoop::params::conf_dir,
+ filename => 'mapred-queue-acls.xml',
+ module => 'hdp-hadoop',
+ configuration => $configuration['mapred-queue-acls'],
+- owner => $hdp-hadoop::params::mapred_user,
++ owner => $hdp_hadoop::params::mapred_user,
+ group => $hdp::params::user_group
+ }
+ } else { # Manually overriding ownership of file installed by hadoop package
+ file { "${hdp-hadoop::params::conf_dir}/mapred-queue-acls.xml":
+- owner => $hdp-hadoop::params::mapred_user,
++ owner => $hdp_hadoop::params::mapred_user,
+ group => $hdp::params::user_group
+ }
+ }
+
+ if has_key($configuration, 'hadoop-policy') {
+ configgenerator::configfile{'hadoop-policy':
+- modulespath => $hdp-hadoop::params::conf_dir,
++ modulespath => $hdp_hadoop::params::conf_dir,
+ filename => 'hadoop-policy.xml',
+ module => 'hdp-hadoop',
+ configuration => $configuration['hadoop-policy'],
+- owner => $hdp-hadoop::params::hdfs_user,
++ owner => $hdp_hadoop::params::hdfs_user,
+ group => $hdp::params::user_group
+ }
+ } else { # Manually overriding ownership of file installed by hadoop package
+ file { "${hdp-hadoop::params::conf_dir}/hadoop-policy.xml":
+- owner => $hdp-hadoop::params::hdfs_user,
++ owner => $hdp_hadoop::params::hdfs_user,
+ group => $hdp::params::user_group
+ }
+ }
+
+ if has_key($configuration, 'core-site') {
+ configgenerator::configfile{'core-site':
+- modulespath => $hdp-hadoop::params::conf_dir,
++ modulespath => $hdp_hadoop::params::conf_dir,
+ filename => 'core-site.xml',
+ module => 'hdp-hadoop',
+ configuration => $configuration['core-site'],
+- owner => $hdp-hadoop::params::hdfs_user,
++ owner => $hdp_hadoop::params::hdfs_user,
+ group => $hdp::params::user_group
+ }
+ } else { # Manually overriding ownership of file installed by hadoop package
+ file { "${hdp-hadoop::params::conf_dir}/core-site.xml":
+- owner => $hdp-hadoop::params::hdfs_user,
++ owner => $hdp_hadoop::params::hdfs_user,
+ group => $hdp::params::user_group
+ }
+ }
+
+ if has_key($configuration, 'mapred-site') {
+ configgenerator::configfile{'mapred-site':
+- modulespath => $hdp-hadoop::params::conf_dir,
++ modulespath => $hdp_hadoop::params::conf_dir,
+ filename => 'mapred-site.xml',
+ module => 'hdp-hadoop',
+ configuration => $configuration['mapred-site'],
+- owner => $hdp-hadoop::params::mapred_user,
++ owner => $hdp_hadoop::params::mapred_user,
+ group => $hdp::params::user_group
+ }
+ } else { # Manually overriding ownership of file installed by hadoop package
+ file { "${hdp-hadoop::params::conf_dir}/mapred-site.xml":
+- owner => $hdp-hadoop::params::mapred_user,
++ owner => $hdp_hadoop::params::mapred_user,
+ group => $hdp::params::user_group
+ }
+ }
+@@ -108,7 +108,7 @@ class hdp-hadoop::initialize()
+ $task_log4j_properties_location = "${hdp-hadoop::params::conf_dir}/task-log4j.properties"
+
+ file { $task_log4j_properties_location:
+- owner => $hdp-hadoop::params::mapred_user,
++ owner => $hdp_hadoop::params::mapred_user,
+ group => $hdp::params::user_group,
+ mode => 644,
+ ensure => present,
+@@ -118,16 +118,16 @@ class hdp-hadoop::initialize()
+
+ if has_key($configuration, 'capacity-scheduler') {
+ configgenerator::configfile{'capacity-scheduler':
+- modulespath => $hdp-hadoop::params::conf_dir,
++ modulespath => $hdp_hadoop::params::conf_dir,
+ filename => 'capacity-scheduler.xml',
+ module => 'hdp-hadoop',
+ configuration => $configuration['capacity-scheduler'],
+- owner => $hdp-hadoop::params::hdfs_user,
++ owner => $hdp_hadoop::params::hdfs_user,
+ group => $hdp::params::user_group,
+ }
+ } else { # Manually overriding ownership of file installed by hadoop package
+ file { "${hdp-hadoop::params::conf_dir}/capacity-scheduler.xml":
+- owner => $hdp-hadoop::params::hdfs_user,
++ owner => $hdp_hadoop::params::hdfs_user,
+ group => $hdp::params::user_group
+ }
+ }
+@@ -135,16 +135,16 @@ class hdp-hadoop::initialize()
+
+ if has_key($configuration, 'hdfs-site') {
+ configgenerator::configfile{'hdfs-site':
+- modulespath => $hdp-hadoop::params::conf_dir,
++ modulespath => $hdp_hadoop::params::conf_dir,
+ filename => 'hdfs-site.xml',
+ module => 'hdp-hadoop',
+ configuration => $configuration['hdfs-site'],
+- owner => $hdp-hadoop::params::hdfs_user,
++ owner => $hdp_hadoop::params::hdfs_user,
+ group => $hdp::params::user_group
+ }
+ } else { # Manually overriding ownership of file installed by hadoop package
+ file { "${hdp-hadoop::params::conf_dir}/hdfs-site.xml":
+- owner => $hdp-hadoop::params::hdfs_user,
++ owner => $hdp_hadoop::params::hdfs_user,
+ group => $hdp::params::user_group
+ }
+ }
+@@ -164,27 +164,27 @@ class hdp-hadoop::initialize()
+ }
+
+ file { "${hdp-hadoop::params::conf_dir}/configuration.xsl":
+- owner => $hdp-hadoop::params::hdfs_user,
++ owner => $hdp_hadoop::params::hdfs_user,
+ group => $hdp::params::user_group
+ }
+
+ file { "${hdp-hadoop::params::conf_dir}/fair-scheduler.xml":
+- owner => $hdp-hadoop::params::mapred_user,
++ owner => $hdp_hadoop::params::mapred_user,
+ group => $hdp::params::user_group
+ }
+
+ file { "${hdp-hadoop::params::conf_dir}/masters":
+- owner => $hdp-hadoop::params::hdfs_user,
++ owner => $hdp_hadoop::params::hdfs_user,
+ group => $hdp::params::user_group
+ }
+
+ file { "${hdp-hadoop::params::conf_dir}/ssl-client.xml.example":
+- owner => $hdp-hadoop::params::mapred_user,
++ owner => $hdp_hadoop::params::mapred_user,
+ group => $hdp::params::user_group
+ }
+
+ file { "${hdp-hadoop::params::conf_dir}/ssl-server.xml.example":
+- owner => $hdp-hadoop::params::mapred_user,
++ owner => $hdp_hadoop::params::mapred_user,
+ group => $hdp::params::user_group
+ }
+
+@@ -196,7 +196,7 @@ class hdp-hadoop::initialize()
+ $exlude_file_path = $configuration['hdfs-site']['dfs.hosts.exclude']
+ file { $exlude_file_path :
+ ensure => present,
+- owner => $hdp-hadoop::params::hdfs_user,
++ owner => $hdp_hadoop::params::hdfs_user,
+ group => $hdp::params::user_group
+ }
+ }
+@@ -205,7 +205,7 @@ class hdp-hadoop::initialize()
+ $include_hosts_list = $hdp::params::slave_hosts
+ file { $include_file_path :
+ ensure => present,
+- owner => $hdp-hadoop::params::hdfs_user,
++ owner => $hdp_hadoop::params::hdfs_user,
+ group => $hdp::params::user_group,
+ content => template('hdp-hadoop/include_hosts_list.erb')
+ }
+@@ -220,10 +220,10 @@ class hdp-hadoop(
+ )
+ {
+ include hdp-hadoop::params
+- $hadoop_config_dir = $hdp-hadoop::params::conf_dir
+- $mapred_user = $hdp-hadoop::params::mapred_user
+- $hdfs_user = $hdp-hadoop::params::hdfs_user
+- $hadoop_tmp_dir = $hdp-hadoop::params::hadoop_tmp_dir
++ $hadoop_config_dir = $hdp_hadoop::params::conf_dir
++ $mapred_user = $hdp_hadoop::params::mapred_user
++ $hdfs_user = $hdp_hadoop::params::hdfs_user
++ $hadoop_tmp_dir = $hdp_hadoop::params::hadoop_tmp_dir
+
+ anchor{'hdp-hadoop::begin':}
+ anchor{'hdp-hadoop::end':}
+@@ -270,16 +270,16 @@ class hdp-hadoop(
+ groups => [$hdp::params::user_group]
+ }
+
+- $logdirprefix = $hdp-hadoop::params::hdfs_log_dir_prefix
++ $logdirprefix = $hdp_hadoop::params::hdfs_log_dir_prefix
+ hdp::directory_recursive_create { $logdirprefix:
+ owner => 'root'
+ }
+- $piddirprefix = $hdp-hadoop::params::hadoop_pid_dir_prefix
++ $piddirprefix = $hdp_hadoop::params::hadoop_pid_dir_prefix
+ hdp::directory_recursive_create { $piddirprefix:
+ owner => 'root'
+ }
+
+- $dfs_domain_socket_path_dir = hdp_get_directory_from_filepath($hdp-hadoop::params::dfs_domain_socket_path)
++ $dfs_domain_socket_path_dir = hdp_get_directory_from_filepath($hdp_hadoop::params::dfs_domain_socket_path)
+ hdp::directory_recursive_create { $dfs_domain_socket_path_dir:
+ owner => $hdfs_user,
+ group => $hdp::params::user_group,
+@@ -290,7 +290,7 @@ class hdp-hadoop(
+ if ($hdp::params::security_enabled == true) {
+ file { "${hdp::params::hadoop_bin}/task-controller":
+ owner => 'root',
+- group => $hdp-hadoop::params::mapred_tt_group,
++ group => $hdp_hadoop::params::mapred_tt_group,
+ mode => '6050',
+ require => Hdp-hadoop::Package['hadoop'],
+ before => Anchor['hdp-hadoop::end']
+@@ -395,7 +395,7 @@ class hdp-hadoop::enable-ganglia()
+ ###config file helper
+ define hdp-hadoop::configfile(
+ $owner = undef,
+- $hadoop_conf_dir = $hdp-hadoop::params::conf_dir,
++ $hadoop_conf_dir = $hdp_hadoop::params::conf_dir,
+ $mode = undef,
+ $namenode_host = undef,
+ $jtnode_host = undef,
+@@ -451,9 +451,9 @@ define hdp-hadoop::exec-hadoop(
+ {
+ include hdp-hadoop::params
+ $security_enabled = $hdp::params::security_enabled
+- $conf_dir = $hdp-hadoop::params::conf_dir
+- $hdfs_user = $hdp-hadoop::params::hdfs_user
+- $hbase_user = $hdp-hadoop::params::hbase_user
++ $conf_dir = $hdp_hadoop::params::conf_dir
++ $hdfs_user = $hdp_hadoop::params::hdfs_user
++ $hbase_user = $hdp_hadoop::params::hbase_user
+
+ if ($user == undef) {
+ $run_user = $hdfs_user
+@@ -510,14 +510,14 @@ define hdp-hadoop::exec-hadoop(
+
+ #####
+ define hdp-hadoop::update-log4j-properties(
+- $hadoop_conf_dir = $hdp-hadoop::params::conf_dir
++ $hadoop_conf_dir = $hdp_hadoop::params::conf_dir
+ )
+ {
+ $properties = [
+- { name => 'ambari.jobhistory.database', value => $hdp-hadoop::params::ambari_db_rca_url },
+- { name => 'ambari.jobhistory.driver', value => $hdp-hadoop::params::ambari_db_rca_driver },
+- { name => 'ambari.jobhistory.user', value => $hdp-hadoop::params::ambari_db_rca_username },
+- { name => 'ambari.jobhistory.password', value => $hdp-hadoop::params::ambari_db_rca_password },
++ { name => 'ambari.jobhistory.database', value => $hdp_hadoop::params::ambari_db_rca_url },
++ { name => 'ambari.jobhistory.driver', value => $hdp_hadoop::params::ambari_db_rca_driver },
++ { name => 'ambari.jobhistory.user', value => $hdp_hadoop::params::ambari_db_rca_username },
++ { name => 'ambari.jobhistory.password', value => $hdp_hadoop::params::ambari_db_rca_password },
+ { name => 'ambari.jobhistory.logger', value => 'DEBUG,JHA' },
+
+ { name => 'log4j.appender.JHA', value => 'org.apache.ambari.log4j.hadoop.mapreduce.jobhistory.JobHistoryAppender' },
+@@ -538,7 +538,7 @@ define hdp-hadoop::update-log4j-properties(
+ #####
+ define hdp-hadoop::update-log4j-property(
+ $log4j_file,
+- $hadoop_conf_dir = $hdp-hadoop::params::conf_dir
++ $hadoop_conf_dir = $hdp_hadoop::params::conf_dir
+ )
+ {
+ hdp::exec{ "sed -i 's~\\(${hdp-hadoop::params::rca_disabled_prefix}\\)\\?${name[name]}=.*~${hdp-hadoop::params::rca_prefix}${name[name]}=${name[value]}~' ${hadoop_conf_dir}/${log4j_file}":
+diff --git a/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/jobtracker.pp b/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/jobtracker.pp
+index 23503da..a15a57b 100644
+--- a/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/jobtracker.pp
++++ b/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/jobtracker.pp
+@@ -30,8 +30,8 @@ class hdp-hadoop::jobtracker(
+
+ if ($service_state == 'no_op') {
+ } elsif ($service_state in ['running','stopped','installed_and_configured','uninstalled']) {
+- $mapred_user = $hdp-hadoop::params::mapred_user
+- $mapred_local_dir = $hdp-hadoop::params::mapred_local_dir
++ $mapred_user = $hdp_hadoop::params::mapred_user
++ $mapred_local_dir = $hdp_hadoop::params::mapred_local_dir
+
+ #adds package, users and directories, and common hadoop configs
+ include hdp-hadoop::initialize
+@@ -43,7 +43,7 @@ class hdp-hadoop::jobtracker(
+ masterhost => $masterHost,
+ keytabdst => "${$keytab_path}/jt.service.keytab",
+ keytabfile => 'jt.service.keytab',
+- owner => $hdp-hadoop::params::mapred_user
++ owner => $hdp_hadoop::params::mapred_user
+ }
+ }
+
+@@ -55,7 +55,7 @@ class hdp-hadoop::jobtracker(
+ Hdp-Hadoop::Configfile<||>{jtnode_host => $hdp::params::host_address}
+
+ #TODO: do we keep precondition here?
+- if ($service_state == 'running' and $hdp-hadoop::params::use_preconditions == true) {
++ if ($service_state == 'running' and $hdp_hadoop::params::use_preconditions == true) {
+ class { 'hdp-hadoop::hdfs::service_check':
+ before => Hdp-hadoop::Service['jobtracker'],
+ require => Class['hdp-hadoop']
+@@ -88,7 +88,7 @@ define hdp-hadoop::jobtracker::create_local_dirs($service_state)
+ {
+ $dirs = hdp_array_from_comma_list($name)
+ hdp::directory_recursive_create { $dirs :
+- owner => $hdp-hadoop::params::mapred_user,
++ owner => $hdp_hadoop::params::mapred_user,
+ mode => '0755',
+ service_state => $service_state,
+ force => true
+diff --git a/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/journalnode.pp b/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/journalnode.pp
+index f45c684..049bf00 100644
+--- a/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/journalnode.pp
++++ b/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/journalnode.pp
+@@ -30,8 +30,8 @@ class hdp-hadoop::journalnode(
+ Hdp-hadoop::Package<||>{include_64_bit => true}
+ Hdp-hadoop::Configfile<||>{sizes +> 64}
+
+- $jn_edits_dir = $hdp-hadoop::params::jn_edits_dir
+- $hdfs_user = $hdp-hadoop::params::hdfs_user
++ $jn_edits_dir = $hdp_hadoop::params::jn_edits_dir
++ $hdfs_user = $hdp_hadoop::params::hdfs_user
+
+ if ($service_state == 'no_op') {
+ } elsif ($service_state in ['running','stopped','installed_and_configured','uninstalled']) {
+@@ -47,7 +47,7 @@ class hdp-hadoop::journalnode(
+
+ hdp-hadoop::service{ 'journalnode':
+ ensure => $service_state,
+- user => $hdp-hadoop::params::hdfs_user,
++ user => $hdp_hadoop::params::hdfs_user,
+ create_pid_dir => true,
+ create_log_dir => true
+ }
+diff --git a/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/namenode.pp b/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/namenode.pp
+index d0fc226..fcfecd5 100644
+--- a/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/namenode.pp
++++ b/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/namenode.pp
+@@ -33,7 +33,7 @@ class hdp-hadoop::namenode(
+
+ if ($service_state == 'no_op') {
+ } elsif ($service_state in ['running','stopped','installed_and_configured','uninstalled']) {
+- $dfs_name_dir = $hdp-hadoop::params::dfs_name_dir
++ $dfs_name_dir = $hdp_hadoop::params::dfs_name_dir
+
+ #adds package, users and directories, and common hadoop configs
+ include hdp-hadoop::initialize
+@@ -45,20 +45,20 @@ class hdp-hadoop::namenode(
+ masterhost => $masterHost,
+ keytabdst => "${$keytab_path}/nn.service.keytab",
+ keytabfile => 'nn.service.keytab',
+- owner => $hdp-hadoop::params::hdfs_user
++ owner => $hdp_hadoop::params::hdfs_user
+ }
+ hdp::download_keytab { 'namenode_hdfs_headless_keytab' :
+ masterhost => $masterHost,
+ keytabdst => "${$keytab_path}/hdfs.headless.keytab",
+ keytabfile => 'hdfs.headless.keytab',
+- owner => $hdp-hadoop::params::hdfs_user,
++ owner => $hdp_hadoop::params::hdfs_user,
+ hostnameInPrincipals => 'no'
+ }
+ hdp::download_keytab { 'namenode_spnego_keytab' :
+ masterhost => $masterHost,
+ keytabdst => "${$keytab_path}/spnego.service.keytab",
+ keytabfile => 'spnego.service.keytab',
+- owner => $hdp-hadoop::params::hdfs_user,
++ owner => $hdp_hadoop::params::hdfs_user,
+ mode => '0440',
+ group => $hdp::params::user_group
+ }
+@@ -77,7 +77,7 @@ class hdp-hadoop::namenode(
+
+ hdp-hadoop::service{ 'namenode':
+ ensure => $service_state,
+- user => $hdp-hadoop::params::hdfs_user,
++ user => $hdp_hadoop::params::hdfs_user,
+ initial_wait => hdp_option_value($opts,'wait')
+ }
+
+@@ -112,7 +112,7 @@ define hdp-hadoop::namenode::create_name_dirs($service_state)
+ {
+ $dirs = hdp_array_from_comma_list($name)
+ hdp::directory_recursive_create { $dirs :
+- owner => $hdp-hadoop::params::hdfs_user,
++ owner => $hdp_hadoop::params::hdfs_user,
+ mode => '0755',
+ service_state => $service_state,
+ force => true
+@@ -126,25 +126,25 @@ define hdp-hadoop::namenode::create_app_directories($service_state)
+
+ hdp-hadoop::hdfs::directory{ "/tmp" :
+ service_state => $service_state,
+- owner => $hdp-hadoop::params::hdfs_user,
++ owner => $hdp_hadoop::params::hdfs_user,
+ mode => '777'
+ }
+
+ hdp-hadoop::hdfs::directory{ '/mapred' :
+ service_state => $service_state,
+- owner => $hdp-hadoop::params::mapred_user
++ owner => $hdp_hadoop::params::mapred_user
+ }
+
+ hdp-hadoop::hdfs::directory{ '/mapred/system' :
+ service_state => $service_state,
+- owner => $hdp-hadoop::params::mapred_user
++ owner => $hdp_hadoop::params::mapred_user
+ }
+
+ Hdp-hadoop::Hdfs::Directory['/mapred'] -> Hdp-hadoop::Hdfs::Directory['/mapred/system']
+
+ if ($hdp::params::hbase_master_hosts != "") {
+
+- hdp-hadoop::hdfs::directory { $hdp-hadoop::params::hdfs_root_dir:
++ hdp-hadoop::hdfs::directory { $hdp_hadoop::params::hdfs_root_dir:
+ owner => $hdp::params::hbase_user,
+ service_state => $service_state
+ }
+diff --git a/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/namenode/format.pp b/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/namenode/format.pp
+index fb9d2ab..60a4f53 100644
+--- a/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/namenode/format.pp
++++ b/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/namenode/format.pp
+@@ -22,10 +22,10 @@ class hdp-hadoop::namenode::format(
+ $force = false
+ )
+ {
+- $mark_dir = $hdp-hadoop::params::namenode_formatted_mark_dir
+- $dfs_name_dir = $hdp-hadoop::params::dfs_name_dir
++ $mark_dir = $hdp_hadoop::params::namenode_formatted_mark_dir
++ $dfs_name_dir = $hdp_hadoop::params::dfs_name_dir
+ $hdfs_user = $hdp::params::hdfs_user
+- $hadoop_conf_dir = $hdp-hadoop::params::conf_dir
++ $hadoop_conf_dir = $hdp_hadoop::params::conf_dir
+
+ # Avoid formatting standby namenode in a HA cluster
+ if ($hdp::params::dfs_ha_enabled == false) {
+diff --git a/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/service.pp b/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/service.pp
+index 98def76..f32e1f2 100644
+--- a/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/service.pp
++++ b/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/service.pp
+@@ -32,7 +32,7 @@ define hdp-hadoop::service(
+ #NOTE does not work if namenode and datanode are on same host
+ $pid_dir = "${hdp-hadoop::params::hadoop_pid_dir_prefix}/${user}"
+
+- $hadoop_libexec_dir = $hdp-hadoop::params::hadoop_libexec_dir
++ $hadoop_libexec_dir = $hdp_hadoop::params::hadoop_libexec_dir
+
+ if (($security_enabled == true) and ($name == 'datanode')) {
+ $run_as_root = true
+diff --git a/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/snamenode.pp b/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/snamenode.pp
+index f2c5beb..eb14f11 100644
+--- a/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/snamenode.pp
++++ b/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/snamenode.pp
+@@ -31,7 +31,7 @@ class hdp-hadoop::snamenode(
+
+ if ($service_state == 'no_op') {
+ } elsif ($service_state in ['running','stopped','installed_and_configured','uninstalled']) {
+- $fs_checkpoint_dir = $hdp-hadoop::params::fs_checkpoint_dir
++ $fs_checkpoint_dir = $hdp_hadoop::params::fs_checkpoint_dir
+
+ #adds package, users and directories, and common hadoop configs
+ include hdp-hadoop::initialize
+@@ -44,13 +44,13 @@ class hdp-hadoop::snamenode(
+ masterhost => $masterHost,
+ keytabdst => "${$keytab_path}/nn.service.keytab",
+ keytabfile => 'nn.service.keytab',
+- owner => $hdp-hadoop::params::hdfs_user
++ owner => $hdp_hadoop::params::hdfs_user
+ }
+ hdp::download_keytab { 'snamenode_spnego_keytab' :
+ masterhost => $masterHost,
+ keytabdst => "${$keytab_path}/spnego.service.keytab",
+ keytabfile => 'spnego.service.keytab',
+- owner => $hdp-hadoop::params::hdfs_user,
++ owner => $hdp_hadoop::params::hdfs_user,
+ mode => '0440',
+ group => $hdp::params::user_group
+ }
+@@ -73,7 +73,7 @@ class hdp-hadoop::snamenode(
+
+ hdp-hadoop::service{ 'secondarynamenode':
+ ensure => $service_state,
+- user => $hdp-hadoop::params::hdfs_user,
++ user => $hdp_hadoop::params::hdfs_user,
+ create_pid_dir => $create_pid_dir,
+ create_log_dir => $create_log_dir
+ }
+@@ -90,7 +90,7 @@ define hdp-hadoop::snamenode::create_name_dirs($service_state)
+ {
+ $dirs = hdp_array_from_comma_list($name)
+ hdp::directory_recursive_create { $dirs :
+- owner => $hdp-hadoop::params::hdfs_user,
++ owner => $hdp_hadoop::params::hdfs_user,
+ mode => '0755',
+ service_state => $service_state,
+ force => true
+diff --git a/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/tasktracker.pp b/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/tasktracker.pp
+index e6869d6..b34a76e 100644
+--- a/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/tasktracker.pp
++++ b/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/tasktracker.pp
+@@ -37,7 +37,7 @@ class hdp-hadoop::tasktracker(
+
+ if ($service_state == 'no_op') {
+ } elsif ($service_state in ['running','stopped','installed_and_configured','uninstalled']) {
+- $mapred_local_dir = $hdp-hadoop::params::mapred_local_dir
++ $mapred_local_dir = $hdp_hadoop::params::mapred_local_dir
+
+ #adds package, users and directories, and common hadoop configs
+ include hdp-hadoop::initialize
+@@ -49,7 +49,7 @@ class hdp-hadoop::tasktracker(
+ masterhost => $masterHost,
+ keytabdst => "${$keytab_path}/tt.service.keytab",
+ keytabfile => 'tt.service.keytab',
+- owner => $hdp-hadoop::params::mapred_user
++ owner => $hdp_hadoop::params::mapred_user
+ }
+ }
+
+@@ -67,7 +67,7 @@ class hdp-hadoop::tasktracker(
+
+ hdp-hadoop::service{ 'tasktracker':
+ ensure => $service_state,
+- user => $hdp-hadoop::params::mapred_user,
++ user => $hdp_hadoop::params::mapred_user,
+ create_pid_dir => $create_pid_dir,
+ create_log_dir => $create_log_dir
+ }
+@@ -85,7 +85,7 @@ define hdp-hadoop::tasktracker::create_local_dirs($service_state)
+ if ($hdp::params::service_exists['hdp-hadoop::jobtracker'] != true) {
+ $dirs = hdp_array_from_comma_list($name)
+ hdp::directory_recursive_create_ignore_failure { $dirs :
+- owner => $hdp-hadoop::params::mapred_user,
++ owner => $hdp_hadoop::params::mapred_user,
+ mode => '0755',
+ service_state => $service_state,
+ force => true
+diff --git a/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/zkfc.pp b/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/zkfc.pp
+index 5f74012..22b7a16 100644
+--- a/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/zkfc.pp
++++ b/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/zkfc.pp
+@@ -28,7 +28,7 @@ class hdp-hadoop::zkfc(
+ Hdp-hadoop::Package<||>{include_64_bit => true}
+ Hdp-hadoop::Configfile<||>{sizes +> 64}
+
+- $hdfs_user = $hdp-hadoop::params::hdfs_user
++ $hdfs_user = $hdp_hadoop::params::hdfs_user
+
+ if ($service_state == 'no_op') {
+ } elsif ($service_state in ['running','stopped','installed_and_configured','uninstalled']) {
+@@ -38,7 +38,7 @@ class hdp-hadoop::zkfc(
+
+ hdp-hadoop::service{ 'zkfc':
+ ensure => $service_state,
+- user => $hdp-hadoop::params::hdfs_user,
++ user => $hdp_hadoop::params::hdfs_user,
+ create_pid_dir => true,
+ create_log_dir => true
+ }
+diff --git a/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/client.pp b/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/client.pp
+index b0931df..b9dc2b9 100644
+--- a/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/client.pp
++++ b/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/client.pp
+@@ -24,7 +24,7 @@ class hdp-hbase::client(
+ )
+ {
+ include hdp-hbase::params
+- $hbase_tmp_dir = $hdp-hbase::params::hbase_tmp_dir
++ $hbase_tmp_dir = $hdp_hbase::params::hbase_tmp_dir
+
+ #assumption is there are no other hbase components on node
+ if ($service_state == 'no_op') {
+@@ -37,7 +37,7 @@ class hdp-hbase::client(
+ }
+
+ hdp::directory_recursive_create_ignore_failure { "${hbase_tmp_dir}/local/jars":
+- owner => $hdp-hbase::params::hbase_user,
++ owner => $hdp_hbase::params::hbase_user,
+ context_tag => 'hbase_client',
+ service_state => $service_state,
+ force => true
+diff --git a/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/hbase/service_check.pp b/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/hbase/service_check.pp
+index 6bad593..abba07a 100644
+--- a/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/hbase/service_check.pp
++++ b/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/hbase/service_check.pp
+@@ -24,7 +24,7 @@ class hdp-hbase::hbase::service_check() inherits hdp-hbase::params
+ $security_enabled = $hdp::params::security_enabled
+ $conf_dir = $hdp::params::hbase_conf_dir
+ $smoke_user_keytab = $hdp::params::smokeuser_keytab
+- $hbase_user = $hdp-hbase::params::hbase_user
++ $hbase_user = $hdp_hbase::params::hbase_user
+ $hbase_keytab = $hdp::params::hbase_user_keytab
+ $serviceCheckData = hdp_unique_id_and_date()
+ $kinit_cmd = "${hdp::params::kinit_path_local} -kt ${smoke_user_keytab} ${smoke_test_user};"
+diff --git a/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/init.pp b/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/init.pp
+index 384fff5..25ffab8 100644
+--- a/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/init.pp
++++ b/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/init.pp
+@@ -24,8 +24,8 @@ class hdp-hbase(
+ {
+ include hdp-hbase::params
+
+- $hbase_user = $hdp-hbase::params::hbase_user
+- $config_dir = $hdp-hbase::params::conf_dir
++ $hbase_user = $hdp_hbase::params::hbase_user
++ $config_dir = $hdp_hbase::params::conf_dir
+
+ $hdp::params::component_exists['hdp-hbase'] = true
+ $smokeuser = $hdp::params::smokeuser
+@@ -35,7 +35,7 @@ class hdp-hbase(
+
+ if has_key($configuration, 'hbase-site') {
+ configgenerator::configfile{'hbase-site':
+- modulespath => $hdp-hbase::params::conf_dir,
++ modulespath => $hdp_hbase::params::conf_dir,
+ filename => 'hbase-site.xml',
+ module => 'hdp-hbase',
+ configuration => $configuration['hbase-site'],
+@@ -51,7 +51,7 @@ class hdp-hbase(
+
+ if has_key($configuration, 'hdfs-site') {
+ configgenerator::configfile{'hdfs-site':
+- modulespath => $hdp-hbase::params::conf_dir,
++ modulespath => $hdp_hbase::params::conf_dir,
+ filename => 'hdfs-site.xml',
+ module => 'hdp-hbase',
+ configuration => $configuration['hdfs-site'],
+@@ -67,7 +67,7 @@ class hdp-hbase(
+
+ if has_key($configuration, 'hbase-policy') {
+ configgenerator::configfile{'hbase-policy':
+- modulespath => $hdp-hbase::params::conf_dir,
++ modulespath => $hdp_hbase::params::conf_dir,
+ filename => 'hbase-policy.xml',
+ module => 'hdp-hbase',
+ configuration => $configuration['hbase-policy'],
+@@ -106,7 +106,7 @@ class hdp-hbase(
+ override_owner => true
+ }
+
+- hdp-hbase::configfile { ['hbase-env.sh', $hdp-hbase::params::metric-prop-file-name ]:
++ hdp-hbase::configfile { ['hbase-env.sh', $hdp_hbase::params::metric-prop-file-name ]:
+ type => $type
+ }
+
+@@ -132,10 +132,10 @@ define hdp-hbase::configfile(
+ $hbase_master_hosts = undef,
+ $template_tag = undef,
+ $type = undef,
+- $conf_dir = $hdp-hbase::params::conf_dir
++ $conf_dir = $hdp_hbase::params::conf_dir
+ )
+ {
+- if ($name == $hdp-hbase::params::metric-prop-file-name) {
++ if ($name == $hdp_hbase::params::metric-prop-file-name) {
+ if ($type == 'master') {
+ $tag = GANGLIA-MASTER
+ } else {
+@@ -147,7 +147,7 @@ define hdp-hbase::configfile(
+
+ hdp::configfile { "${conf_dir}/${name}":
+ component => 'hbase',
+- owner => $hdp-hbase::params::hbase_user,
++ owner => $hdp_hbase::params::hbase_user,
+ mode => $mode,
+ hbase_master_hosts => $hbase_master_hosts,
+ template_tag => $tag
+diff --git a/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/master.pp b/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/master.pp
+index c16b1af..b357f43 100644
+--- a/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/master.pp
++++ b/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/master.pp
+@@ -61,6 +61,6 @@ class hdp-hbase::master(
+ #assumes that master and regionserver will not be on same machine
+ class hdp-hbase::master::enable-ganglia()
+ {
+- Hdp-hbase::Configfile<|title == $metric-prop-file-name |>{template_tag => 'GANGLIA-MASTER'}
++ Hdp-hbase::Configfile<|title == $metric_prop_file_name |>{template_tag => 'GANGLIA-MASTER'}
+ }
+
+diff --git a/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/params.pp b/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/params.pp
+index 4eb5ad0..04ae4c9 100644
+--- a/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/params.pp
++++ b/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/params.pp
+@@ -102,9 +102,9 @@ class hdp-hbase::params() inherits hdp::params
+ }
+
+ if (hdp_get_major_stack_version($hdp::params::stack_version) >= 2) {
+- $metric-prop-file-name = "hadoop-metrics2-hbase.properties"
++ $metric_prop_file_name = "hadoop-metrics2-hbase.properties"
+ } else {
+- $metric-prop-file-name = "hadoop-metrics.properties"
++ $metric_prop_file_name = "hadoop-metrics.properties"
+ }
+ $smokeuser_permissions = hdp_default("smokeuser_permissions", "RWXCA")
+ }
+diff --git a/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/regionserver.pp b/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/regionserver.pp
+index 434f4f1..53217cd 100644
+--- a/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/regionserver.pp
++++ b/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/regionserver.pp
+@@ -69,5 +69,5 @@ class hdp-hbase::regionserver(
+ #assumes that master and regionserver will not be on same machine
+ class hdp-hbase::regionserver::enable-ganglia()
+ {
+- Hdp-hbase::Configfile<|title == $metric-prop-file-name |>{template_tag => 'GANGLIA-RS'}
++ Hdp-hbase::Configfile<|title == $metric_prop_file_name |>{template_tag => 'GANGLIA-RS'}
+ }
+diff --git a/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/service.pp b/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/service.pp
+index 8ab9645..4df7dd0 100644
+--- a/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/service.pp
++++ b/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/service.pp
+@@ -27,15 +27,15 @@ define hdp-hbase::service(
+ include hdp-hbase::params
+
+ $role = $name
+- $user = $hdp-hbase::params::hbase_user
++ $user = $hdp_hbase::params::hbase_user
+
+ $conf_dir = $hdp::params::hbase_conf_dir
+ $hbase_daemon = $hdp::params::hbase_daemon_script
+ $cmd = "$hbase_daemon --config ${conf_dir}"
+- $pid_dir = $hdp-hbase::params::hbase_pid_dir
++ $pid_dir = $hdp_hbase::params::hbase_pid_dir
+ $pid_file = "${pid_dir}/hbase-hbase-${role}.pid"
+- $hbase_log_dir = $hdp-hbase::params::hbase_log_dir
+- $hbase_tmp_dir = $hdp-hbase::params::hbase_tmp_dir
++ $hbase_log_dir = $hdp_hbase::params::hbase_log_dir
++ $hbase_tmp_dir = $hdp_hbase::params::hbase_tmp_dir
+
+ if ($ensure == 'running') {
+ $daemon_cmd = "su - ${user} -c '${cmd} start ${role}'"
+diff --git a/ambari-agent/src/main/puppet/modules/hdp-hcat/manifests/init.pp b/ambari-agent/src/main/puppet/modules/hdp-hcat/manifests/init.pp
+index 1fb0ced..1502700 100644
+--- a/ambari-agent/src/main/puppet/modules/hdp-hcat/manifests/init.pp
++++ b/ambari-agent/src/main/puppet/modules/hdp-hcat/manifests/init.pp
+@@ -22,8 +22,8 @@ class hdp-hcat(
+ $service_state = $hdp::params::cluster_client_state
+ ) inherits hdp-hcat::params
+ {
+- $hcat_config_dir = $hdp-hcat::params::hcat_conf_dir
+- $hcat_pid_dir = $hdp-hcat::params::hcat_pid_dir
++ $hcat_config_dir = $hdp_hcat::params::hcat_conf_dir
++ $hcat_pid_dir = $hdp_hcat::params::hcat_pid_dir
+
+ if ($hdp::params::use_32_bits_on_slaves == false) {
+ $size = 64
+diff --git a/ambari-agent/src/main/puppet/modules/hdp-hive/manifests/init.pp b/ambari-agent/src/main/puppet/modules/hdp-hive/manifests/init.pp
+index d7a58c1..9467f4d 100644
+--- a/ambari-agent/src/main/puppet/modules/hdp-hive/manifests/init.pp
++++ b/ambari-agent/src/main/puppet/modules/hdp-hive/manifests/init.pp
+@@ -25,12 +25,12 @@ class hdp-hive(
+ {
+ include hdp-hive::params
+
+- $hive_user = $hdp-hive::params::hive_user
++ $hive_user = $hdp_hive::params::hive_user
+ if ($server == true) {
+- $hive_config_dir = $hdp-hive::params::hive_server_conf_dir
++ $hive_config_dir = $hdp_hive::params::hive_server_conf_dir
+ $config_file_mode = '0600'
+ } else {
+- $hive_config_dir = $hdp-hive::params::hive_conf_dir
++ $hive_config_dir = $hdp_hive::params::hive_conf_dir
+ $config_file_mode = '0644'
+ }
+
+@@ -108,38 +108,38 @@ class hdp-hive(
+ define hdp-hive::configfile(
+ $mode = undef,
+ $hive_server_host = undef,
+- $config_dir = $hdp-hive::params::hive_conf_dir
++ $config_dir = $hdp_hive::params::hive_conf_dir
+ )
+ {
+ hdp::configfile { "${config_dir}/${name}":
+ component => 'hive',
+- owner => $hdp-hive::params::hive_user,
++ owner => $hdp_hive::params::hive_user,
+ mode => $mode,
+ hive_server_host => $hive_server_host
+ }
+ }
+
+ define hdp-hive::ownership(
+- $config_dir = $hdp-hive::params::hive_conf_dir
++ $config_dir = $hdp_hive::params::hive_conf_dir
+ )
+ {
+ file { "${config_dir}/hive-default.xml.template":
+- owner => $hdp-hive::params::hive_user,
++ owner => $hdp_hive::params::hive_user,
+ group => $hdp::params::user_group
+ }
+
+ file { "${config_dir}/hive-env.sh.template":
+- owner => $hdp-hive::params::hive_user,
++ owner => $hdp_hive::params::hive_user,
+ group => $hdp::params::user_group
+ }
+
+ file { "${config_dir}/hive-exec-log4j.properties.template":
+- owner => $hdp-hive::params::hive_user,
++ owner => $hdp_hive::params::hive_user,
+ group => $hdp::params::user_group
+ }
+
+ file { "${config_dir}/hive-log4j.properties.template":
+- owner => $hdp-hive::params::hive_user,
++ owner => $hdp_hive::params::hive_user,
+ group => $hdp::params::user_group
+ }
+ }
+diff --git a/ambari-agent/src/main/puppet/modules/hdp-hive/manifests/jdbc-connector.pp b/ambari-agent/src/main/puppet/modules/hdp-hive/manifests/jdbc-connector.pp
+index 8bd9302..8e6d377 100644
+--- a/ambari-agent/src/main/puppet/modules/hdp-hive/manifests/jdbc-connector.pp
++++ b/ambari-agent/src/main/puppet/modules/hdp-hive/manifests/jdbc-connector.pp
+@@ -22,12 +22,12 @@ class hdp-hive::jdbc-connector()
+ {
+ include hdp-hive::params
+
+- $jdbc_jar_name = $hdp-hive::params::jdbc_jar_name
++ $jdbc_jar_name = $hdp_hive::params::jdbc_jar_name
+
+ $java_share_dir = "/usr/share/java"
+ $driver_curl_target = "${java_share_dir}/${jdbc_jar_name}"
+
+- $hive_lib = $hdp-hive::params::hive_lib
++ $hive_lib = $hdp_hive::params::hive_lib
+ $target = "${hive_lib}/${jdbc_jar_name}"
+
+ $jdk_location = $hdp::params::jdk_location
+diff --git a/ambari-agent/src/main/puppet/modules/hdp-hive/manifests/metastore.pp b/ambari-agent/src/main/puppet/modules/hdp-hive/manifests/metastore.pp
+index 29bfd97..2d2741e 100644
+--- a/ambari-agent/src/main/puppet/modules/hdp-hive/manifests/metastore.pp
++++ b/ambari-agent/src/main/puppet/modules/hdp-hive/manifests/metastore.pp
+@@ -36,7 +36,7 @@ class hdp-hive::metastore(
+ masterhost => $masterHost,
+ keytabdst => "${$keytab_path}/hive.service.keytab",
+ keytabfile => 'hive.service.keytab',
+- owner => $hdp-hive::params::hive_user
++ owner => $hdp_hive::params::hive_user
+ }
+ }
+
+diff --git a/ambari-agent/src/main/puppet/modules/hdp-hive/manifests/server.pp b/ambari-agent/src/main/puppet/modules/hdp-hive/manifests/server.pp
+index 7f4db1f..efde2bf 100644
+--- a/ambari-agent/src/main/puppet/modules/hdp-hive/manifests/server.pp
++++ b/ambari-agent/src/main/puppet/modules/hdp-hive/manifests/server.pp
+@@ -36,7 +36,7 @@ class hdp-hive::server(
+ masterhost => $masterHost,
+ keytabdst => "${$keytab_path}/hive.service.keytab",
+ keytabfile => 'hive.service.keytab',
+- owner => $hdp-hive::params::hive_user
++ owner => $hdp_hive::params::hive_user
+ }
+ }
+
+diff --git a/ambari-agent/src/main/puppet/modules/hdp-hive/manifests/service.pp b/ambari-agent/src/main/puppet/modules/hdp-hive/manifests/service.pp
+index ed7731c..f80e8ca 100644
+--- a/ambari-agent/src/main/puppet/modules/hdp-hive/manifests/service.pp
++++ b/ambari-agent/src/main/puppet/modules/hdp-hive/manifests/service.pp
+@@ -23,24 +23,24 @@ class hdp-hive::service(
+ $service_type
+ )
+ {
+- include $hdp-hive::params
++ include $hdp_hive::params
+
+- $hive_user = $hdp-hive::params::hive_user
++ $hive_user = $hdp_hive::params::hive_user
+ $hadoop_home = $hdp::params::hadoop_home
+- $hive_pid_dir = $hdp-hive::params::hive_pid_dir
+- $hive_pid = $hdp-hive::params::hive_pid
+- $hive_log_dir = $hdp-hive::params::hive_log_dir
+- $start_hiveserver2_script = $hdp-hive::params::start_hiveserver2_script
+- $start_metastore_script = $hdp-hive::params::start_metastore_script
+- $hive_var_lib = $hdp-hive::params::hive_var_lib
+- $hive_server_conf_dir = $hdp-hive::params::hive_server_conf_dir
++ $hive_pid_dir = $hdp_hive::params::hive_pid_dir
++ $hive_pid = $hdp_hive::params::hive_pid
++ $hive_log_dir = $hdp_hive::params::hive_log_dir
++ $start_hiveserver2_script = $hdp_hive::params::start_hiveserver2_script
++ $start_metastore_script = $hdp_hive::params::start_metastore_script
++ $hive_var_lib = $hdp_hive::params::hive_var_lib
++ $hive_server_conf_dir = $hdp_hive::params::hive_server_conf_dir
+
+ $start_hiveserver2_path = "/tmp/$start_hiveserver2_script"
+ $start_metastore_path = "/tmp/$start_metastore_script"
+
+ if ($service_type == 'metastore') {
+ $pid_file = "$hive_pid_dir/hive.pid"
+- $cmd = "env HADOOP_HOME=${hadoop_home} JAVA_HOME=$hdp::params::java64_home $start_metastore_path ${hive_log_dir}/hive.out ${hive_log_dir}/hive.log $pid_file $hdp-hive::params::hive_server_conf_dir"
++ $cmd = "env HADOOP_HOME=${hadoop_home} JAVA_HOME=$hdp::params::java64_home $start_metastore_path ${hive_log_dir}/hive.out ${hive_log_dir}/hive.log $pid_file $hdp_hive::params::hive_server_conf_dir"
+
+ } elsif ($service_type == 'hiveserver2') {
+ $pid_file = "$hive_pid_dir/$hive_pid"
+@@ -120,7 +120,7 @@ class hdp-hive::service(
+ define hdp-hive::service::directory()
+ {
+ hdp::directory_recursive_create { $name:
+- owner => $hdp-hive::params::hive_user,
++ owner => $hdp_hive::params::hive_user,
+ mode => '0755',
+ service_state => $::ensure,
+ force => true
+diff --git a/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/init.pp b/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/init.pp
+index 876f76c..424860b 100644
+--- a/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/init.pp
++++ b/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/init.pp
+@@ -22,9 +22,9 @@ class hdp-hue(
+ $service_state = undef
+ )
+ {
+- include $hdp-hue::params
++ include $hdp_hue::params
+
+- $hue_user = $hdp-hue::params::hue_server_user
++ $hue_user = $hdp_hue::params::hue_server_user
+ $hue_conf_dir = $hdp::params::hue_conf_dir
+
+ if ($service_state == 'uninstalled') {
+@@ -57,7 +57,7 @@ class hdp-hue(
+ # Configs generation
+ if has_key($configuration, 'hue-site') {
+ hdp-hue::generate_config_file { 'hue-ini':
+- config_file_path => $hdp-hue::params::hue_conf_file
++ config_file_path => $hdp_hue::params::hue_conf_file
+ }
+ }
+
+@@ -77,7 +77,7 @@ define hdp-hue::generate_config_file(
+ file { $config_file_path :
+ ensure => file,
+ content => template('hdp-hue/hue-ini.cfg.erb'),
+- owner => $hdp-hue::params::hue_server_user
++ owner => $hdp_hue::params::hue_server_user
+ }
+ }
+ }
+\ No newline at end of file
+diff --git a/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/params.pp b/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/params.pp
+index 533501d..79a5521 100644
+--- a/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/params.pp
++++ b/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/params.pp
+@@ -43,65 +43,65 @@ class hdp-hue::params() inherits hdp::params {
+ # All non-global properties
+
+ if has_key($configuration, 'hue-site') {
+- $hue-site = $configuration['hue-site']
++ $hue_site = $configuration['hue-site']
+
+ # Hadoop Configuration properties
+
+- $hue_hadoop_fs_defaultfs = hdp_get_value_from_map($hue-site, "fs_defaultfs", "")
+- $hue_hadoop_webhdfs_url = hdp_get_value_from_map($hue-site, "webhdfs_url", "")
+- $hue_hadoop_jt_host = hdp_get_value_from_map($hue-site, "jobtracker_host", hdp_default("jtnode_host"))
+- $hue_hadoop_jt_port = hdp_get_value_from_map($hue-site, "jobtracker_port", "50030")
+- $hue_hive_home_dir = hdp_get_value_from_map($hue-site, "hive_home_dir", "/usr/lib/hive")
+- $hue_templeton_url = hdp_get_value_from_map($hue-site, "templeton_url", "http://${webhcat_server_host}:50111/templeton/v1")
++ $hue_hadoop_fs_defaultfs = hdp_get_value_from_map($hue_site, "fs_defaultfs", "")
++ $hue_hadoop_webhdfs_url = hdp_get_value_from_map($hue_site, "webhdfs_url", "")
++ $hue_hadoop_jt_host = hdp_get_value_from_map($hue_site, "jobtracker_host", hdp_default("jtnode_host"))
++ $hue_hadoop_jt_port = hdp_get_value_from_map($hue_site, "jobtracker_port", "50030")
++ $hue_hive_home_dir = hdp_get_value_from_map($hue_site, "hive_home_dir", "/usr/lib/hive")
++ $hue_templeton_url = hdp_get_value_from_map($hue_site, "templeton_url", "http://${webhcat_server_host}:50111/templeton/v1")
+
+ # Database Configuration properties
+
+- $hue_db_engine = hdp_get_value_from_map($hue-site, "db_engine", "")
+- $hue_db_port = hdp_get_value_from_map($hue-site, "db_port", "")
+- $hue_db_host = hdp_get_value_from_map($hue-site, "db_host", "")
+- $hue_db_user = hdp_get_value_from_map($hue-site, "db_user", "")
+- $hue_db_password = hdp_get_value_from_map($hue-site, "db_password", "")
+- $hue_db_name = hdp_get_value_from_map($hue-site, "db_name", "")
++ $hue_db_engine = hdp_get_value_from_map($hue_site, "db_engine", "")
++ $hue_db_port = hdp_get_value_from_map($hue_site, "db_port", "")
++ $hue_db_host = hdp_get_value_from_map($hue_site, "db_host", "")
++ $hue_db_user = hdp_get_value_from_map($hue_site, "db_user", "")
++ $hue_db_password = hdp_get_value_from_map($hue_site, "db_password", "")
++ $hue_db_name = hdp_get_value_from_map($hue_site, "db_name", "")
+
+ # Hue Email Configuration properties
+
+- $hue_smtp_host = hdp_get_value_from_map($hue-site, "smtp_host", "")
+- $hue_smtp_port = hdp_get_value_from_map($hue-site, "smtp_port", "")
+- $hue_smtp_user = hdp_get_value_from_map($hue-site, "smtp_user", "")
+- $hue_smtp_password = hdp_get_value_from_map($hue-site, "smtp_password", "")
+- $hue_smtp_tls = hdp_get_value_from_map($hue-site, "tls", "no")
+- $hue_default_from_email = hdp_get_value_from_map($hue-site, "default_from_email", "hueadmin at sandbox.com")
++ $hue_smtp_host = hdp_get_value_from_map($hue_site, "smtp_host", "")
++ $hue_smtp_port = hdp_get_value_from_map($hue_site, "smtp_port", "")
++ $hue_smtp_user = hdp_get_value_from_map($hue_site, "smtp_user", "")
++ $hue_smtp_password = hdp_get_value_from_map($hue_site, "smtp_password", "")
++ $hue_smtp_tls = hdp_get_value_from_map($hue_site, "tls", "no")
++ $hue_default_from_email = hdp_get_value_from_map($hue_site, "default_from_email", "hueadmin at sandbox.com")
+
+ # Hue Configuration properties
+
+- $hue_debug_messages = hdp_get_value_from_map($hue-site, "send_debug_messages", "1")
+- $hue_database_logging = hdp_get_value_from_map($hue-site, "database_logging", "0")
+- $hue_secret_key = hdp_get_value_from_map($hue-site, "secret_key", "ThisisusedforsecurehashinginthesessionstoreSetthistoarandomstringthelongerthebetter")
+- $hue_http_host = hdp_get_value_from_map($hue-site, "http_host", "0.0.0.0")
+- $hue_http_port = hdp_get_value_from_map($hue-site, "http_port", "8000")
+- $hue_time_zone = hdp_get_value_from_map($hue-site, "time_zone", "America/Los_Angeles")
+- $hue_django_debug_mode = hdp_get_value_from_map($hue-site, "django_debug_mode", "1")
+- $hue_use_cherrypy_server = hdp_get_value_from_map($hue-site, "use_cherrypy_server", "false")
+- $hue_http_500_debug_mode = hdp_get_value_from_map($hue-site, "http_500_debug_mode", "1")
+- $hue_backend_auth_policy = hdp_get_value_from_map($hue-site, "backend_auth", "desktop.auth.backend.AllowAllBackend")
++ $hue_debug_messages = hdp_get_value_from_map($hue_site, "send_debug_messages", "1")
++ $hue_database_logging = hdp_get_value_from_map($hue_site, "database_logging", "0")
++ $hue_secret_key = hdp_get_value_from_map($hue_site, "secret_key", "ThisisusedforsecurehashinginthesessionstoreSetthistoarandomstringthelongerthebetter")
++ $hue_http_host = hdp_get_value_from_map($hue_site, "http_host", "0.0.0.0")
++ $hue_http_port = hdp_get_value_from_map($hue_site, "http_port", "8000")
++ $hue_time_zone = hdp_get_value_from_map($hue_site, "time_zone", "America/Los_Angeles")
++ $hue_django_debug_mode = hdp_get_value_from_map($hue_site, "django_debug_mode", "1")
++ $hue_use_cherrypy_server = hdp_get_value_from_map($hue_site, "use_cherrypy_server", "false")
++ $hue_http_500_debug_mode = hdp_get_value_from_map($hue_site, "http_500_debug_mode", "1")
++ $hue_backend_auth_policy = hdp_get_value_from_map($hue_site, "backend_auth", "desktop.auth.backend.AllowAllBackend")
+
+- $hue_hadoop_yarn_host = hdp_get_value_from_map($hue-site, "resourcemanager_host", "")
+- $hue_hadoop_yarn_port = hdp_get_value_from_map($hue-site, "resourcemanager_port", "")
++ $hue_hadoop_yarn_host = hdp_get_value_from_map($hue_site, "resourcemanager_host", "")
++ $hue_hadoop_yarn_port = hdp_get_value_from_map($hue_site, "resourcemanager_port", "")
+
+ # Shell Configuration properties
+
+- $hue_pig_shell_command = hdp_get_value_from_map($hue-site, "pig_shell_command", "/usr/bin/pig -l /dev/null")
+- $hue_hbase_nice_name = hdp_get_value_from_map($hue-site, "hbase_nice_name", "HBase Shell")
+- $hue_hbase_shell_command = hdp_get_value_from_map($hue-site, "hbase_shell_command", "/usr/bin/hbase shell")
+- $hue_bash_nice_name = hdp_get_value_from_map($hue-site, "bash_nice_name", "Bash (Test only!!!)")
+- $hue_bash_shell_command = hdp_get_value_from_map($hue-site, "bash_shell_command", "/bin/bash")
++ $hue_pig_shell_command = hdp_get_value_from_map($hue_site, "pig_shell_command", "/usr/bin/pig -l /dev/null")
++ $hue_hbase_nice_name = hdp_get_value_from_map($hue_site, "hbase_nice_name", "HBase Shell")
++ $hue_hbase_shell_command = hdp_get_value_from_map($hue_site, "hbase_shell_command", "/usr/bin/hbase shell")
++ $hue_bash_nice_name = hdp_get_value_from_map($hue_site, "bash_nice_name", "Bash (Test only!!!)")
++ $hue_bash_shell_command = hdp_get_value_from_map($hue_site, "bash_shell_command", "/bin/bash")
+
+- $hue_whitelist = hdp_get_value_from_map($hue-site, "whitelist", "(localhost|127\\.0\\.0\\.1):(${jtnode_port}|${namenode_port}|${tasktracker_port}|${datanode_port}|${jobhistory_port})")
++ $hue_whitelist = hdp_get_value_from_map($hue_site, "whitelist", "(localhost|127\\.0\\.0\\.1):(${jtnode_port}|${namenode_port}|${tasktracker_port}|${datanode_port}|${jobhistory_port})")
+
+ # Security Configuration properties
+
+- $hue_keytab_path = hdp_get_value_from_map($hue-site, "hue_keytab", "${keytab_path}/hue.service.keytab")
+- $hue_principal = hdp_get_value_from_map($hue-site, "hue_principal", "hue/_HOST@${kerberos_domain}")
++ $hue_keytab_path = hdp_get_value_from_map($hue_site, "hue_keytab", "${keytab_path}/hue.service.keytab")
++ $hue_principal = hdp_get_value_from_map($hue_site, "hue_principal", "hue/_HOST@${kerberos_domain}")
+
+ }
+
+diff --git a/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/server.pp b/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/server.pp
+index bcbb150..1672359 100644
+--- a/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/server.pp
++++ b/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/server.pp
+@@ -32,7 +32,7 @@ class hdp-hue::server(
+ service_state => $service_state,
+ }
+
+- Hdp-hue::Generate_config_file<||>{ config_file_path => $hdp-hue::params::hue_conf_file }
++ Hdp-hue::Generate_config_file<||>{ config_file_path => $hdp_hue::params::hue_conf_file }
+
+ class { 'hdp-hue::service' :
+ ensure => $service_state
+diff --git a/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/service.pp b/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/service.pp
+index 179337e..6d18f6b 100644
+--- a/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/service.pp
++++ b/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/service.pp
+@@ -23,14 +23,14 @@ class hdp-hue::service(
+ $initial_wait = undef
+ )
+ {
+- include $hdp-hue::params
++ include $hdp_hue::params
+
+- $hue_user = $hdp-hue::params::hue_server_user
++ $hue_user = $hdp_hue::params::hue_server_user
+ $hue_start_cmd = "/etc/init.d/hue start --USER=${hue_user} --LOGDIR=${hue_log_dir} --LOCKFILE=${hue_lock_file} --PIDFILE=${hue_pid_dir}/supervisor.pid"
+ $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_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"
+
+@@ -68,7 +68,7 @@ define hdp-hue::service::directory(
+ )
+ {
+ hdp::directory_recursive_create { $name:
+- owner => $hdp-hue::params::hue_server_user,
++ owner => $hdp_hue::params::hue_server_user,
+ mode => '0755',
+ service_state => $service_state,
+ force => true
+diff --git a/ambari-agent/src/main/puppet/modules/hdp-kerberos/manifests/adminclient.pp b/ambari-agent/src/main/puppet/modules/hdp-kerberos/manifests/adminclient.pp
+index 9176de3..e9ecc5d 100644
+--- a/ambari-agent/src/main/puppet/modules/hdp-kerberos/manifests/adminclient.pp
++++ b/ambari-agent/src/main/puppet/modules/hdp-kerberos/manifests/adminclient.pp
+@@ -106,7 +106,7 @@ define hdp-kerberos::keytab(
+ exec { "xst ${keytab}":
+ command => "rm -rf ${keytab_filename}; ${kadmin_cmd} -q 'xst -k ${keytab_filename} ${principals_list}'; chown puppet:apache ${keytab_filename}",
+ unless => "klist -kt ${keytab_filename} 2>/dev/null | grep -q ' ${principals[0]}'", #TODO may make more robust test
+- path => $hdp-kerberos::params::exec_path,
++ path => $hdp_kerberos::params::exec_path,
+ }
+
+ if (($keytable_file_owner != undef) or ($keytable_file_mode != undef)) {
+@@ -135,6 +135,6 @@ define hdp-kerberos::principal(
+ exec { "addprinc ${principal}":
+ command => "${kadmin_cmd} -q 'addprinc -randkey ${principal}'",
+ unless => "${kadmin_cmd} -q listprincs | grep -q '^${principal}$'",
+- path => $hdp-kerberos::params::exec_path
++ path => $hdp_kerberos::params::exec_path
+ }
+ }
+diff --git a/ambari-agent/src/main/puppet/modules/hdp-mysql/manifests/params.pp b/ambari-agent/src/main/puppet/modules/hdp-mysql/manifests/params.pp
+index 039c58d..1ead401 100644
+--- a/ambari-agent/src/main/puppet/modules/hdp-mysql/manifests/params.pp
++++ b/ambari-agent/src/main/puppet/modules/hdp-mysql/manifests/params.pp
+@@ -20,9 +20,9 @@
+ #
+ class hdp-mysql::params() inherits hdp-hive::params
+ {
+- $db_name = "$hdp-hive::params::hive_database_name"
+- $db_user = $hdp-hive::params::hive_metastore_user_name
+- $db_pw = $hdp-hive::params::hive_metastore_user_passwd
++ $db_name = "$hdp_hive::params::hive_database_name"
++ $db_user = $hdp_hive::params::hive_metastore_user_name
++ $db_pw = $hdp_hive::params::hive_metastore_user_passwd
+ $mysql_user = hdp_default("mysql_user","mysql")
+ $mysql_group = hdp_default("mysql_group","mysql")
+ }
+diff --git a/ambari-agent/src/main/puppet/modules/hdp-mysql/manifests/server.pp b/ambari-agent/src/main/puppet/modules/hdp-mysql/manifests/server.pp
+index 54b480d..3292b70 100644
+--- a/ambari-agent/src/main/puppet/modules/hdp-mysql/manifests/server.pp
++++ b/ambari-agent/src/main/puppet/modules/hdp-mysql/manifests/server.pp
+@@ -26,9 +26,9 @@ class hdp-mysql::server(
+ if ($service_state in ['no_op','uninstalled']) {
+ } elsif ($service_state in ['running','stopped','installed_and_configured']) {
+
+- $db_user = $hdp-mysql::params::db_user
+- $db_pw = hdp_escape_spec_characters($hdp-mysql::params::db_pw)
+- $db_name = $hdp-mysql::params::db_name
++ $db_user = $hdp_mysql::params::db_user
++ $db_pw = hdp_escape_spec_characters($hdp_mysql::params::db_pw)
++ $db_name = $hdp_mysql::params::db_name
+ $host = $hdp::params::hive_mysql_host
+
+ anchor { 'hdp-mysql::server::begin':}
+diff --git a/ambari-agent/src/main/puppet/modules/hdp-nagios/manifests/server.pp b/ambari-agent/src/main/puppet/modules/hdp-nagios/manifests/server.pp
+index b409ab8..ede36b2 100644
+--- a/ambari-agent/src/main/puppet/modules/hdp-nagios/manifests/server.pp
++++ b/ambari-agent/src/main/puppet/modules/hdp-nagios/manifests/server.pp
+@@ -22,14 +22,14 @@ class hdp-nagios::server(
+ $service_state = $hdp::params::cluster_service_state
+ ) inherits hdp-nagios::params
+ {
+- $nagios_var_dir = $hdp-nagios::params::nagios_var_dir
+- $nagios_rw_dir = $hdp-nagios::params::nagios_rw_dir
+- $nagios_config_dir = $hdp-nagios::params::conf_dir
+- $plugins_dir = $hdp-nagios::params::plugins_dir
+- $nagios_obj_dir = $hdp-nagios::params::nagios_obj_dir
+- $check_result_path = $hdp-nagios::params::check_result_path
+- $nagios_httpd_config_file = $hdp-nagios::params::httpd_conf_file
+- $pid_file = $hdp-nagios::params::nagios_pid_file
++ $nagios_var_dir = $hdp_nagios::params::nagios_var_dir
++ $nagios_rw_dir = $hdp_nagios::params::nagios_rw_dir
++ $nagios_config_dir = $hdp_nagios::params::conf_dir
++ $plugins_dir = $hdp_nagios::params::plugins_dir
++ $nagios_obj_dir = $hdp_nagios::params::nagios_obj_dir
++ $check_result_path = $hdp_nagios::params::check_result_path
++ $nagios_httpd_config_file = $hdp_nagios::params::httpd_conf_file
++ $pid_file = $hdp_nagios::params::nagios_pid_file
+
+ if hdp_is_empty($hdp::params::pathes[nagios_p1_pl]) {
+ hdp_fail("There is no path to p1.pl file for nagios")
+@@ -220,7 +220,7 @@ class hdp-nagios::server(
+
+ class hdp-nagios::server::web_permisssions()
+ {
+- $web_login = $hdp-nagios::params::nagios_web_login
++ $web_login = $hdp_nagios::params::nagios_web_login
+ $htpasswd_cmd_os = $hdp::params::cmds[htpasswd]#[$hdp::params::hdp_os_type]
+
+
+@@ -251,15 +251,15 @@ class hdp-nagios::server::web_permisssions()
+ }
+
+ file { "/etc/nagios/htpasswd.users" :
+- owner => $hdp-nagios::params::nagios_user,
+- group => $hdp-nagios::params::nagios_group,
++ owner => $hdp_nagios::params::nagios_user,
++ group => $hdp_nagios::params::nagios_group,
+ mode => '0640'
+ }
+
+ if ($hdp::params::hdp_os_type == "suse") {
+- $command = "usermod -G $hdp-nagios::params::nagios_group wwwrun"
++ $command = "usermod -G $hdp_nagios::params::nagios_group wwwrun"
+ } else {
+- $command = "usermod -a -G $hdp-nagios::params::nagios_group apache"
++ $command = "usermod -a -G $hdp_nagios::params::nagios_group apache"
+ }
+
+ hdp::exec { "apache_permissions_htpasswd.users" :
+@@ -271,7 +271,7 @@ class hdp-nagios::server::web_permisssions()
+
+ class hdp-nagios::server::services($ensure)
+ {
+- $pid_file = $hdp-nagios::params::nagios_pid_file
++ $pid_file = $hdp_nagios::params::nagios_pid_file
+
+ if ($ensure == 'running') {
+ $command = "service nagios start"
+diff --git a/ambari-agent/src/main/puppet/modules/hdp-nagios/manifests/server/config.pp b/ambari-agent/src/main/puppet/modules/hdp-nagios/manifests/server/config.pp
+index c527e1f..261b866 100644
+--- a/ambari-agent/src/main/puppet/modules/hdp-nagios/manifests/server/config.pp
++++ b/ambari-agent/src/main/puppet/modules/hdp-nagios/manifests/server/config.pp
+@@ -21,11 +21,11 @@
+ class hdp-nagios::server::config()
+ {
+
+- $host_cfg = $hdp-nagios::params::nagios_host_cfg
++ $host_cfg = $hdp_nagios::params::nagios_host_cfg
+ $nagios_lookup_daemon_str = $hdp::params::nagios_lookup_daemon_strs[$hdp::params::hdp_os_type]
+
+- hdp-nagios::server::configfile { 'nagios.cfg': conf_dir => $hdp-nagios::params::conf_dir, group => $hdp-nagios::params::nagios_group }
+- hdp-nagios::server::configfile { 'resource.cfg': conf_dir => $hdp-nagios::params::conf_dir, group => $hdp-nagios::params::nagios_group }
++ hdp-nagios::server::configfile { 'nagios.cfg': conf_dir => $hdp_nagios::params::conf_dir, group => $hdp_nagios::params::nagios_group }
++ hdp-nagios::server::configfile { 'resource.cfg': conf_dir => $hdp_nagios::params::conf_dir, group => $hdp_nagios::params::nagios_group }
+ hdp-nagios::server::configfile { 'hadoop-hosts.cfg': }
+ hdp-nagios::server::configfile { 'hadoop-hostgroups.cfg': }
+ hdp-nagios::server::configfile { 'hadoop-servicegroups.cfg': }
+@@ -60,9 +60,9 @@ class hdp-nagios::server::config()
+
+ ###config file helper
+ define hdp-nagios::server::configfile(
+- $owner = $hdp-nagios::params::nagios_user,
++ $owner = $hdp_nagios::params::nagios_user,
+ $group = $hdp::params::user_group,
+- $conf_dir = $hdp-nagios::params::nagios_obj_dir,
++ $conf_dir = $hdp_nagios::params::nagios_obj_dir,
+ $mode = undef
+ )
+ {
+diff --git a/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/init.pp b/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/init.pp
+index f1256c1..3918e66 100644
+--- a/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/init.pp
++++ b/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/init.pp
+@@ -28,8 +28,8 @@ class hdp-oozie(
+
+ # Configs generation
+
+- $oozie_user = $hdp-oozie::params::oozie_user
+- $oozie_config_dir = $hdp-oozie::params::conf_dir
++ $oozie_user = $hdp_oozie::params::oozie_user
++ $oozie_config_dir = $hdp_oozie::params::conf_dir
+
+ if has_key($configuration, 'oozie-site') {
+ configgenerator::configfile{'oozie-site':
+@@ -116,7 +116,7 @@ define hdp-oozie::configfile(
+ {
+ hdp::configfile { "${hdp-oozie::params::conf_dir}/${name}":
+ component => 'oozie',
+- owner => $hdp-oozie::params::oozie_user,
++ owner => $hdp_oozie::params::oozie_user,
+ mode => $mode,
+ oozie_server => $oozie_server
+ }
+@@ -124,27 +124,27 @@ define hdp-oozie::configfile(
+
+ define hdp-oozie::ownership {
+ file { "${hdp-oozie::params::conf_dir}/adminusers.txt":
+- owner => $hdp-oozie::params::oozie_user,
++ owner => $hdp_oozie::params::oozie_user,
+ group => $hdp::params::user_group
+ }
+
+ file { "${hdp-oozie::params::conf_dir}/hadoop-config.xml":
+- owner => $hdp-oozie::params::oozie_user,
++ owner => $hdp_oozie::params::oozie_user,
+ group => $hdp::params::user_group
+ }
+
+ file { "${hdp-oozie::params::conf_dir}/oozie-default.xml":
+- owner => $hdp-oozie::params::oozie_user,
++ owner => $hdp_oozie::params::oozie_user,
+ group => $hdp::params::user_group
+ }
+
+ file { "${hdp-oozie::params::conf_dir}/action-conf":
+- owner => $hdp-oozie::params::oozie_user,
++ owner => $hdp_oozie::params::oozie_user,
+ group => $hdp::params::user_group
+ }
+
+ file { "${hdp-oozie::params::conf_dir}/action-conf/hive.xml":
+- owner => $hdp-oozie::params::oozie_user,
++ owner => $hdp_oozie::params::oozie_user,
+ group => $hdp::params::user_group
+ }
+ }
+diff --git a/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/service.pp b/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/service.pp
+index 2d4711b..f733a22 100644
+--- a/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/service.pp
++++ b/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/service.pp
+@@ -24,11 +24,11 @@ class hdp-oozie::service(
+ $initial_wait = undef
+ )
+ {
+- include $hdp-oozie::params
++ include $hdp_oozie::params
+
+- $user = "$hdp-oozie::params::oozie_user"
+- $hadoop_home = $hdp-oozie::params::hadoop_prefix
+- $oozie_tmp = $hdp-oozie::params::oozie_tmp_dir
++ $user = "$hdp_oozie::params::oozie_user"
++ $hadoop_home = $hdp_oozie::params::hadoop_prefix
++ $oozie_tmp = $hdp_oozie::params::oozie_tmp_dir
+ $oozie_hdfs_user_dir = $hdp::params::oozie_hdfs_user_dir
+ $cmd = "env HADOOP_HOME=${hadoop_home} /usr/sbin/oozie_server.sh"
+ $pid_file = "${hdp-oozie::params::oozie_pid_dir}/oozie.pid"
+@@ -43,7 +43,7 @@ class hdp-oozie::service(
+ $lzo_enabled = $hdp::params::lzo_enabled
+
+ $security = $hdp::params::security_enabled
+- $oozie_keytab = $hdp-oozie::params::oozie_service_keytab
++ $oozie_keytab = $hdp_oozie::params::oozie_service_keytab
+ $oozie_principal = $configuration['oozie-site']['oozie.service.HadoopAccessorService.kerberos.principal']
+
+ $oracle_driver_jar_name = "ojdbc6.jar"
+@@ -140,12 +140,12 @@ class hdp-oozie::service(
+ $daemon_cmd = undef
+ }
+
+- hdp-oozie::service::directory { $hdp-oozie::params::oozie_pid_dir : }
+- hdp-oozie::service::directory { $hdp-oozie::params::oozie_log_dir : }
+- hdp-oozie::service::directory { $hdp-oozie::params::oozie_tmp_dir : }
+- hdp-oozie::service::directory { $hdp-oozie::params::oozie_data_dir : }
+- hdp-oozie::service::directory { $hdp-oozie::params::oozie_lib_dir : }
+- hdp-oozie::service::directory { $hdp-oozie::params::oozie_webapps_dir : }
++ hdp-oozie::service::directory { $hdp_oozie::params::oozie_pid_dir : }
++ hdp-oozie::service::directory { $hdp_oozie::params::oozie_log_dir : }
++ hdp-oozie::service::directory { $hdp_oozie::params::oozie_tmp_dir : }
++ hdp-oozie::service::directory { $hdp_oozie::params::oozie_data_dir : }
++ hdp-oozie::service::directory { $hdp_oozie::params::oozie_lib_dir : }
++ hdp-oozie::service::directory { $hdp_oozie::params::oozie_webapps_dir : }
+
+ anchor{'hdp-oozie::service::begin':} -> Hdp-oozie::Service::Directory<||> -> anchor{'hdp-oozie::service::end':}
+
+@@ -188,9 +188,9 @@ class hdp-oozie::service(
+ define hdp-oozie::service::directory()
+ {
+ hdp::directory_recursive_create { $name:
+- owner => $hdp-oozie::params::oozie_user,
++ owner => $hdp_oozie::params::oozie_user,
+ mode => '0755',
+- service_state => $hdp-oozie::service::ensure,
++ service_state => $hdp_oozie::service::ensure,
+ force => true
+ }
+ }
+@@ -208,7 +208,7 @@ define hdp-oozie::service::exec_sh()
+ hdp::exec { "exec $name":
+ command => "/bin/sh -c '$name'",
+ unless => $no_op_test,
+- initial_wait => $hdp-oozie::service::initial_wait
++ initial_wait => $hdp_oozie::service::initial_wait
+ }
+ }
+
+@@ -218,6 +218,6 @@ define hdp-oozie::service::exec_user()
+ hdp::exec { "exec $name":
+ command => "su - ${hdp-oozie::service::user} -c '$name'",
+ unless => $no_op_test,
+- initial_wait => $hdp-oozie::service::initial_wait
++ initial_wait => $hdp_oozie::service::initial_wait
+ }
+ }
+diff --git a/ambari-agent/src/main/puppet/modules/hdp-pig/manifests/init.pp b/ambari-agent/src/main/puppet/modules/hdp-pig/manifests/init.pp
+index 902d967..104cd7c 100644
+--- a/ambari-agent/src/main/puppet/modules/hdp-pig/manifests/init.pp
++++ b/ambari-agent/src/main/puppet/modules/hdp-pig/manifests/init.pp
+@@ -22,7 +22,7 @@ class hdp-pig(
+ $service_state = $hdp::params::cluster_client_state
+ ) inherits hdp-pig::params
+ {
+- $pig_config_dir = $hdp-pig::params::pig_conf_dir
++ $pig_config_dir = $hdp_pig::params::pig_conf_dir
+
+ if ($hdp::params::use_32_bits_on_slaves == false) {
+ $size = 64
+diff --git a/ambari-agent/src/main/puppet/modules/hdp-sqoop/manifests/mysql-connector.pp b/ambari-agent/src/main/puppet/modules/hdp-sqoop/manifests/mysql-connector.pp
+index 12a3971..88ee0e3 100644
+--- a/ambari-agent/src/main/puppet/modules/hdp-sqoop/manifests/mysql-connector.pp
++++ b/ambari-agent/src/main/puppet/modules/hdp-sqoop/manifests/mysql-connector.pp
+@@ -24,7 +24,7 @@ class hdp-sqoop::mysql-connector()
+ include hdp-hive::params
+
+ $target = "${hdp::params::artifact_dir}/${zip_name}"
+- $sqoop_lib = $hdp-sqoop::params::sqoop_lib
++ $sqoop_lib = $hdp_sqoop::params::sqoop_lib
+
+ anchor { 'hdp-sqoop::mysql-connector::begin':}
+
+diff --git a/ambari-agent/src/main/puppet/modules/hdp-templeton/manifests/download-hive-tar.pp b/ambari-agent/src/main/puppet/modules/hdp-templeton/manifests/download-hive-tar.pp
+index cc0754c..1d786ae 100644
+--- a/ambari-agent/src/main/puppet/modules/hdp-templeton/manifests/download-hive-tar.pp
++++ b/ambari-agent/src/main/puppet/modules/hdp-templeton/manifests/download-hive-tar.pp
+@@ -22,8 +22,8 @@ class hdp-templeton::download-hive-tar()
+ {
+ include hdp-templeton::params
+
+- $src_tar_name = $hdp-templeton::params::src_hive_tar_name
+- $dest_tar_name = $hdp-templeton::params::dest_hive_tar_name
++ $src_tar_name = $hdp_templeton::params::src_hive_tar_name
++ $dest_tar_name = $hdp_templeton::params::dest_hive_tar_name
+ $target = "${hdp::params::artifact_dir}/${dest_tar_name}"
+
+ anchor { 'hdp-templeton::download-hive-tar::begin':}
+diff --git a/ambari-agent/src/main/puppet/modules/hdp-templeton/manifests/download-pig-tar.pp b/ambari-agent/src/main/puppet/modules/hdp-templeton/manifests/download-pig-tar.pp
+index 471ed6e..048f366 100644
+--- a/ambari-agent/src/main/puppet/modules/hdp-templeton/manifests/download-pig-tar.pp
++++ b/ambari-agent/src/main/puppet/modules/hdp-templeton/manifests/download-pig-tar.pp
+@@ -22,8 +22,8 @@ class hdp-templeton::download-pig-tar()
+ {
+ include hdp-templeton::params
+
+- $src_tar_name = $hdp-templeton::params::src_pig_tar_name
+- $dest_tar_name = $hdp-templeton::params::dest_pig_tar_name
++ $src_tar_name = $hdp_templeton::params::src_pig_tar_name
++ $dest_tar_name = $hdp_templeton::params::dest_pig_tar_name
+ $target = "${hdp::params::artifact_dir}/${dest_tar_name}"
+
+ anchor { 'hdp-templeton::download-pig-tar::begin':}
+diff --git a/ambari-agent/src/main/puppet/modules/hdp-templeton/manifests/init.pp b/ambari-agent/src/main/puppet/modules/hdp-templeton/manifests/init.pp
+index 2bf5990..9584487 100644
+--- a/ambari-agent/src/main/puppet/modules/hdp-templeton/manifests/init.pp
++++ b/ambari-agent/src/main/puppet/modules/hdp-templeton/manifests/init.pp
+@@ -25,8 +25,8 @@ class hdp-templeton(
+ {
+ # Configs generation
+
+- $webhcat_user = $hdp-templeton::params::webhcat_user
+- $templeton_config_dir = $hdp-templeton::params::conf_dir
++ $webhcat_user = $hdp_templeton::params::webhcat_user
++ $templeton_config_dir = $hdp_templeton::params::conf_dir
+
+ if has_key($configuration, 'webhcat-site') {
+ configgenerator::configfile{'webhcat-site':
+@@ -96,7 +96,7 @@ define hdp-templeton::configfile(
+ {
+ hdp::configfile { "${hdp-templeton::params::conf_dir}/${name}":
+ component => 'templeton',
+- owner => $hdp-templeton::params::webhcat_user,
++ owner => $hdp_templeton::params::webhcat_user,
+ mode => $mode
+ }
+ }
+diff --git a/ambari-agent/src/main/puppet/modules/hdp-templeton/manifests/server.pp b/ambari-agent/src/main/puppet/modules/hdp-templeton/manifests/server.pp
+index 82a225b..7fd9539 100644
+--- a/ambari-agent/src/main/puppet/modules/hdp-templeton/manifests/server.pp
++++ b/ambari-agent/src/main/puppet/modules/hdp-templeton/manifests/server.pp
+@@ -24,7 +24,7 @@ class hdp-templeton::server(
+ ) inherits hdp-templeton::params
+ {
+
+- $templeton_user = $hdp-templeton::params::templeton_user
++ $templeton_user = $hdp_templeton::params::templeton_user
+ if ($service_state == 'no_op') {
+ } elsif ($service_state in ['running','stopped','installed_and_configured','uninstalled']) {
+ $hdp::params::service_exists['hdp-templeton::server'] = true
+diff --git a/ambari-agent/src/main/puppet/modules/hdp-templeton/manifests/service.pp b/ambari-agent/src/main/puppet/modules/hdp-templeton/manifests/service.pp
+index ceb3db0..0dce282 100644
+--- a/ambari-agent/src/main/puppet/modules/hdp-templeton/manifests/service.pp
++++ b/ambari-agent/src/main/puppet/modules/hdp-templeton/manifests/service.pp
+@@ -23,10 +23,10 @@ class hdp-templeton::service(
+ $initial_wait = undef
+ )
+ {
+- include $hdp-templeton::params
++ include $hdp_templeton::params
+
+- $user = "$hdp-templeton::params::webhcat_user"
+- $hadoop_home = $hdp-templeton::params::hadoop_prefix
++ $user = "$hdp_templeton::params::webhcat_user"
++ $hadoop_home = $hdp_templeton::params::hadoop_prefix
+ $cmd = "env HADOOP_HOME=${hadoop_home} /usr/lib/hcatalog/sbin/webhcat_server.sh"
+ $pid_file = "${hdp-templeton::params::templeton_pid_dir}/webhcat.pid"
+
+@@ -40,8 +40,8 @@ class hdp-templeton::service(
+ $daemon_cmd = undef
+ }
+
+- hdp-templeton::service::directory { $hdp-templeton::params::templeton_pid_dir : }
+- hdp-templeton::service::directory { $hdp-templeton::params::hcat_log_dir : }
++ hdp-templeton::service::directory { $hdp_templeton::params::templeton_pid_dir : }
++ hdp-templeton::service::directory { $hdp_templeton::params::hcat_log_dir : }
+
+ anchor{'hdp-templeton::service::begin':} -> Hdp-templeton::Service::Directory<||> -> anchor{'hdp-templeton::service::end':}
+
+@@ -58,9 +58,9 @@ class hdp-templeton::service(
+ define hdp-templeton::service::directory()
+ {
+ hdp::directory_recursive_create { $name:
+- owner => $hdp-templeton::params::webhcat_user,
++ owner => $hdp_templeton::params::webhcat_user,
+ mode => '0755',
+- service_state => $hdp-templeton::service::ensure,
++ service_state => $hdp_templeton::service::ensure,
+ force => true
+ }
+ }
+diff --git a/ambari-agent/src/main/puppet/modules/hdp-templeton/manifests/templeton/service_check.pp b/ambari-agent/src/main/puppet/modules/hdp-templeton/manifests/templeton/service_check.pp
+index 8172ed6..0776792 100644
+--- a/ambari-agent/src/main/puppet/modules/hdp-templeton/manifests/templeton/service_check.pp
++++ b/ambari-agent/src/main/puppet/modules/hdp-templeton/manifests/templeton/service_check.pp
+@@ -46,7 +46,7 @@ define hdp-templeton::smoke_shell_file()
+ {
+ $smoke_test_user = $hdp::params::smokeuser
+
+- $security = $hdp-templeton::templeton::service_check::security
++ $security = $hdp_templeton::templeton::service_check::security
+
+ $kinit_path = $hdp::params::kinit_path_local
+ $smoke_user_keytab = $hdp::params::smokeuser_keytab
+diff --git a/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/historyserver.pp b/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/historyserver.pp
+index 07a9376..f1bb4e1 100644
+--- a/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/historyserver.pp
++++ b/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/historyserver.pp
+@@ -23,7 +23,7 @@ class hdp-yarn::historyserver(
+ $opts = {}
+ ) inherits hdp-yarn::params
+ {
+- $mapred_user = $hdp-yarn::params::mapred_user
++ $mapred_user = $hdp_yarn::params::mapred_user
+
+ if ($service_state == 'no_op') {
+ } elsif ($service_state in 'installed_and_configured') {
+diff --git a/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/init.pp b/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/init.pp
+index 5d74f86..8cd2125 100644
+--- a/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/init.pp
++++ b/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/init.pp
+@@ -21,9 +21,9 @@
+
+ class hdp-yarn::initialize()
+ {
+- $mapred_user = $hdp-yarn::params::mapred_user
++ $mapred_user = $hdp_yarn::params::mapred_user
+ $hdfs_user = $hdp::params::hdfs_user
+- $yarn_user = $hdp-yarn::params::yarn_user
++ $yarn_user = $hdp_yarn::params::yarn_user
+
+ ##Process package
+ hdp-yarn::package{'yarn-common':}
+@@ -59,7 +59,7 @@ class hdp-yarn::initialize()
+
+ define hdp-yarn::generate_common_configs() {
+
+- $yarn_config_dir = $hdp-yarn::params::conf_dir
++ $yarn_config_dir = $hdp_yarn::params::conf_dir
+
+ # Generate configs
+ if has_key($::configuration, 'core-site') {
+@@ -86,13 +86,13 @@ define hdp-yarn::generate_common_configs() {
+ filename => 'mapred-site.xml',
+ module => 'hdp-yarn',
+ configuration => $::configuration['mapred-site'],
+- owner => $hdp-yarn::params::yarn_user,
++ owner => $hdp_yarn::params::yarn_user,
+ group => $hdp::params::user_group,
+ mode => 644
+ }
+ } else { # Manually overriding ownership of file installed by hadoop package
+ file { "${yarn_config_dir}/mapred-site.xml":
+- owner => $hdp-yarn::params::yarn_user,
++ owner => $hdp_yarn::params::yarn_user,
+ group => $hdp::params::user_group,
+ mode => 644
+ }
+@@ -104,13 +104,13 @@ define hdp-yarn::generate_common_configs() {
+ filename => 'yarn-site.xml',
+ module => 'hdp-yarn',
+ configuration => $::configuration['yarn-site'],
+- owner => $hdp-yarn::params::yarn_user,
++ owner => $hdp_yarn::params::yarn_user,
+ group => $hdp::params::user_group,
+ mode => 644
+ }
+ } else { # Manually overriding ownership of file installed by hadoop package
+ file { "${yarn_config_dir}/yarn-site.xml":
+- owner => $hdp-yarn::params::yarn_user,
++ owner => $hdp_yarn::params::yarn_user,
+ group => $hdp::params::user_group,
+ mode => 644
+ }
+@@ -122,13 +122,13 @@ define hdp-yarn::generate_common_configs() {
+ filename => 'capacity-scheduler.xml',
+ module => 'hdp-yarn',
+ configuration => $::configuration['capacity-scheduler'],
+- owner => $hdp-yarn::params::yarn_user,
++ owner => $hdp_yarn::params::yarn_user,
+ group => $hdp::params::user_group,
+ mode => 644
+ }
+ } else { # Manually overriding ownership of file installed by hadoop package
+ file { "${yarn_config_dir}/capacity-scheduler.xml":
+- owner => $hdp-yarn::params::yarn_user,
++ owner => $hdp_yarn::params::yarn_user,
+ group => $hdp::params::user_group,
+ mode => 644
+ }
+@@ -136,7 +136,7 @@ define hdp-yarn::generate_common_configs() {
+
+ hdp::configfile {"${yarn_config_dir}/yarn-env.sh":
+ component => 'yarn',
+- owner => $hdp-yarn::params::yarn_user,
++ owner => $hdp_yarn::params::yarn_user,
+ group => $hdp::params::user_group,
+ mode => 755
+ }
+@@ -152,7 +152,7 @@ define hdp-yarn::generate_common_configs() {
+ $container_executor = "${hdp::params::yarn_container_bin}/container-executor"
+ file { $container_executor:
+ ensure => present,
+- group => $hdp-yarn::params::yarn_executor_container_group,
++ group => $hdp_yarn::params::yarn_executor_container_group,
+ mode => 6050
+ }
+
+diff --git a/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/mapred2/service_check.pp b/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/mapred2/service_check.pp
+index 3ada16e..428ef51 100644
+--- a/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/mapred2/service_check.pp
++++ b/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/mapred2/service_check.pp
+@@ -21,7 +21,7 @@
+ class hdp-yarn::mapred2::service_check() inherits hdp-yarn::params
+ {
+ $smoke_test_user = $hdp::params::smokeuser
+- $hadoopMapredExamplesJarName = $hdp-yarn::params::hadoopMapredExamplesJarName
++ $hadoopMapredExamplesJarName = $hdp_yarn::params::hadoopMapredExamplesJarName
+ $jar_path = "$hdp::params::hadoop_mapred2_jar_location/$hadoopMapredExamplesJarName"
+ $input_file = "/user/${smoke_test_user}/mapredsmokeinput"
+ $output_file = "/user/${smoke_test_user}/mapredsmokeoutput"
+diff --git a/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/nodemanager.pp b/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/nodemanager.pp
+index 67856bb..0f8b3a0 100644
+--- a/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/nodemanager.pp
++++ b/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/nodemanager.pp
+@@ -23,10 +23,10 @@ class hdp-yarn::nodemanager(
+ $opts = {}
+ ) inherits hdp-yarn::params
+ {
+- $yarn_user = $hdp-yarn::params::yarn_user
+- $nm_local_dirs = $hdp-yarn::params::nm_local_dirs
+- $nm_log_dirs = $hdp-yarn::params::nm_log_dirs
+- $yarn_log_dir_prefix = $hdp-yarn::params::yarn_log_dir_prefix
++ $yarn_user = $hdp_yarn::params::yarn_user
++ $nm_local_dirs = $hdp_yarn::params::nm_local_dirs
++ $nm_log_dirs = $hdp_yarn::params::nm_log_dirs
++ $yarn_log_dir_prefix = $hdp_yarn::params::yarn_log_dir_prefix
+
+ if ($service_state == 'no_op') {
+ } elsif ($service_state in 'installed_and_configured') {
+@@ -74,7 +74,7 @@ class hdp-yarn::nodemanager(
+ define hdp-yarn::nodemanager::create_nm_dirs($service_state) {
+ $dirs = hdp_array_from_comma_list($name)
+ hdp::directory_recursive_create_ignore_failure { $dirs :
+- owner => $hdp-yarn::params::yarn_user,
++ owner => $hdp_yarn::params::yarn_user,
+ context_tag => 'yarn_service',
+ service_state => $service_state,
+ force => true
+diff --git a/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/params.pp b/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/params.pp
+index 9fa897a..437657e 100644
+--- a/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/params.pp
++++ b/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/params.pp
+@@ -35,7 +35,7 @@ class hdp-yarn::params(
+ $rm_https_port = $hdp::rm_https_port
+
+ ## yarn-env
+- $hadoop_libexec_dir = $hdp-hadoop::params::hadoop_libexec_dir
++ $hadoop_libexec_dir = $hdp_hadoop::params::hadoop_libexec_dir
+ $hadoop_yarn_home = hdp_default("hadoop_yarn_home","/usr/lib/hadoop-yarn")
+ $yarn_heapsize = hdp_default("yarn_heapsize","1024")
+ $resourcemanager_heapsize = hdp_default("resourcemanager_heapsize","1024")
+diff --git a/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/resourcemanager.pp b/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/resourcemanager.pp
+index 2ecf442..3cff287 100644
+--- a/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/resourcemanager.pp
++++ b/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/resourcemanager.pp
+@@ -23,7 +23,7 @@ class hdp-yarn::resourcemanager(
+ $opts = {}
+ ) inherits hdp-yarn::params
+ {
+- $yarn_user = $hdp-yarn::params::yarn_user
++ $yarn_user = $hdp_yarn::params::yarn_user
+
+ if ($service_state == 'no_op') {
+ } elsif ($service_state in 'installed_and_configured') {
+diff --git a/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/service.pp b/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/service.pp
+index 3589829..fe97fed 100644
+--- a/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/service.pp
++++ b/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/service.pp
+@@ -43,7 +43,7 @@ define hdp-yarn::service(
+ $job_summary_log = "${hdp-yarn::params::yarn_log_dir_prefix}/${user}/hadoop-mapreduce.jobsummary.log"
+ }
+
+- $hadoop_libexec_dir = $hdp-yarn::params::hadoop_libexec_dir
++ $hadoop_libexec_dir = $hdp_yarn::params::hadoop_libexec_dir
+
+ $cmd = "export HADOOP_LIBEXEC_DIR=${hadoop_libexec_dir} && ${daemon} --config ${hdp-yarn::params::conf_dir}"
+
+diff --git a/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/smoketest.pp b/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/smoketest.pp
+index e2faef4..9bcc1bc 100644
+--- a/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/smoketest.pp
++++ b/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/smoketest.pp
+@@ -22,12 +22,12 @@ define hdp-yarn::smoketest(
+ $component_name = undef
+ )
+ {
+- $rm_webui_address = $hdp-yarn::params::rm_webui_address
+- $rm_webui_https_address = $hdp-yarn::params::rm_webui_https_address
+- $nm_webui_address = $hdp-yarn::params::nm_webui_address
+- $hs_webui_address = $hdp-yarn::params::hs_webui_address
++ $rm_webui_address = $hdp_yarn::params::rm_webui_address
++ $rm_webui_https_address = $hdp_yarn::params::rm_webui_https_address
++ $nm_webui_address = $hdp_yarn::params::nm_webui_address
++ $hs_webui_address = $hdp_yarn::params::hs_webui_address
+
+- $hadoop_ssl_enabled = $hdp-hadoop::params::hadoop_ssl_enabled
++ $hadoop_ssl_enabled = $hdp_hadoop::params::hadoop_ssl_enabled
+
+ if ($component_name == 'resourcemanager') {
+ $component_type = 'rm'
+diff --git a/ambari-agent/src/main/puppet/modules/hdp-zookeeper/manifests/init.pp b/ambari-agent/src/main/puppet/modules/hdp-zookeeper/manifests/init.pp
+index 6540f96..9742566 100644
+--- a/ambari-agent/src/main/puppet/modules/hdp-zookeeper/manifests/init.pp
++++ b/ambari-agent/src/main/puppet/modules/hdp-zookeeper/manifests/init.pp
+@@ -31,8 +31,8 @@ class hdp-zookeeper(
+ $hdp::params::service_exists['hdp-zookeeper'] = true
+ }
+ } elsif ($service_state in ['running','stopped','installed_and_configured','uninstalled']) {
+- $zk_user = $hdp-zookeeper::params::zk_user
+- $zk_config_dir = $hdp-zookeeper::params::conf_dir
++ $zk_user = $hdp_zookeeper::params::zk_user
++ $zk_config_dir = $hdp_zookeeper::params::conf_dir
+
+ anchor{'hdp-zookeeper::begin':}
+ anchor{'hdp-zookeeper::end':}
+@@ -127,7 +127,7 @@ define hdp-zookeeper::configfile(
+ {
+ hdp::configfile { "${hdp-zookeeper::params::conf_dir}/${name}":
+ component => 'zookeeper',
+- owner => $hdp-zookeeper::params::zk_user,
++ owner => $hdp_zookeeper::params::zk_user,
+ mode => $mode
+ }
+ }
+diff --git a/ambari-agent/src/main/puppet/modules/hdp-zookeeper/manifests/quorum/service_check.pp b/ambari-agent/src/main/puppet/modules/hdp-zookeeper/manifests/quorum/service_check.pp
+index 159f225..6ea2b67 100644
+--- a/ambari-agent/src/main/puppet/modules/hdp-zookeeper/manifests/quorum/service_check.pp
++++ b/ambari-agent/src/main/puppet/modules/hdp-zookeeper/manifests/quorum/service_check.pp
+@@ -21,7 +21,7 @@
+ class hdp-zookeeper::quorum::service_check()
+ {
+ include hdp-zookeeper::params
+- $conf_dir = $hdp-zookeeper::params::conf_dir
++ $conf_dir = $hdp_zookeeper::params::conf_dir
+ $security_enabled = $hdp::params::security_enabled
+ $smoke_test_user = $hdp::params::smokeuser
+ $kinit_path = $hdp::params::kinit_path_local
+@@ -38,7 +38,7 @@ class hdp-zookeeper::quorum::service_check()
+
+ define hdp-zookeeper::quorum_smoke_shell_file()
+ {
+- $conf_dir = $hdp-zookeeper::params::conf_dir
++ $conf_dir = $hdp_zookeeper::params::conf_dir
+ $smoke_test_user = $hdp::params::smokeuser
+ $smoke_script = $hdp::params::zk_smoke_test_script
+ $smoke_user_keytab = $hdp::params::smokeuser_keytab
+diff --git a/ambari-agent/src/main/puppet/modules/hdp-zookeeper/manifests/service.pp b/ambari-agent/src/main/puppet/modules/hdp-zookeeper/manifests/service.pp
+index 0456520..fd26a2a 100644
+--- a/ambari-agent/src/main/puppet/modules/hdp-zookeeper/manifests/service.pp
++++ b/ambari-agent/src/main/puppet/modules/hdp-zookeeper/manifests/service.pp
+@@ -23,13 +23,13 @@ class hdp-zookeeper::service(
+ $myid
+ )
+ {
+- include $hdp-zookeeper::params
+- $user = $hdp-zookeeper::params::zk_user
+- $conf_dir = $hdp-zookeeper::params::conf_dir
++ include $hdp_zookeeper::params
++ $user = $hdp_zookeeper::params::zk_user
++ $conf_dir = $hdp_zookeeper::params::conf_dir
+ $zk_bin = $hdp::params::zk_bin
+ $cmd = "env ZOOCFGDIR=${conf_dir} ZOOCFG=zoo.cfg ${zk_bin}/zkServer.sh"
+
+- $pid_file = $hdp-zookeeper::params::zk_pid_file
++ $pid_file = $hdp_zookeeper::params::zk_pid_file
+
+ if ($ensure == 'running') {
+ $daemon_cmd = "su - ${user} -c 'source ${conf_dir}/zookeeper-env.sh ; ${cmd} start'"
+@@ -42,19 +42,19 @@ class hdp-zookeeper::service(
+ } else {
+ $daemon_cmd = undef
+ }
+- hdp::directory_recursive_create { $hdp-zookeeper::params::zk_pid_dir:
++ hdp::directory_recursive_create { $hdp_zookeeper::params::zk_pid_dir:
+ owner => $user,
+ context_tag => 'zk_service',
+ service_state => $ensure,
+ force => true
+ }
+- hdp::directory_recursive_create { $hdp-zookeeper::params::zk_log_dir:
++ hdp::directory_recursive_create { $hdp_zookeeper::params::zk_log_dir:
+ owner => $user,
+ context_tag => 'zk_service',
+ service_state => $ensure,
+ force => true
+ }
+- hdp::directory_recursive_create { $hdp-zookeeper::params::zk_data_dir:
++ hdp::directory_recursive_create { $hdp_zookeeper::params::zk_data_dir:
+ owner => $user,
+ context_tag => 'zk_service',
+ service_state => $ensure,
+diff --git a/ambari-agent/src/main/puppet/modules/hdp-zookeeper/manifests/zookeeper/service_check.pp b/ambari-agent/src/main/puppet/modules/hdp-zookeeper/manifests/zookeeper/service_check.pp
+index 283c6ab..001fd53 100644
+--- a/ambari-agent/src/main/puppet/modules/hdp-zookeeper/manifests/zookeeper/service_check.pp
++++ b/ambari-agent/src/main/puppet/modules/hdp-zookeeper/manifests/zookeeper/service_check.pp
+@@ -21,7 +21,7 @@
+ class hdp-zookeeper::zookeeper::service_check()
+ {
+ include hdp-zookeeper::params
+- $conf_dir = $hdp-zookeeper::params::conf_dir
++ $conf_dir = $hdp_zookeeper::params::conf_dir
+ $smoke_script = $hdp::params::zk_smoke_test_script
+ $security_enabled = $hdp::params::security_enabled
+ $smoke_test_user = $hdp::params::smokeuser
+diff --git a/ambari-agent/src/main/puppet/modules/hdp/manifests/init.pp b/ambari-agent/src/main/puppet/modules/hdp/manifests/init.pp
+index 256610d..bf12693 100644
+--- a/ambari-agent/src/main/puppet/modules/hdp/manifests/init.pp
++++ b/ambari-agent/src/main/puppet/modules/hdp/manifests/init.pp
+@@ -35,18 +35,18 @@ class hdp(
+
+ ## Port settings
+ if has_key($configuration, 'hdfs-site') {
+- $hdfs-site = $configuration['hdfs-site']
++ $hdfs_site = $configuration['hdfs-site']
+
+ if (hdp_get_major_stack_version($stack_version) >= 2) {
+- $namenode_port = hdp_get_port_from_url($hdfs-site["dfs.namenode.http-address"])
+- $snamenode_port = hdp_get_port_from_url($hdfs-site["dfs.namenode.secondary.http-address"])
++ $namenode_port = hdp_get_port_from_url($hdfs_site["dfs.namenode.http-address"])
++ $snamenode_port = hdp_get_port_from_url($hdfs_site["dfs.namenode.secondary.http-address"])
+ } else {
+- $namenode_port = hdp_get_port_from_url($hdfs-site["dfs.http.address"])
+- $snamenode_port = hdp_get_port_from_url($hdfs-site["dfs.secondary.http.address"])
++ $namenode_port = hdp_get_port_from_url($hdfs_site["dfs.http.address"])
++ $snamenode_port = hdp_get_port_from_url($hdfs_site["dfs.secondary.http.address"])
+ }
+
+- $datanode_port = hdp_get_port_from_url($hdfs-site["dfs.datanode.http.address"])
+- $journalnode_port = hdp_get_port_from_url($hdfs-site["dfs.journalnode.http-address"])
++ $datanode_port = hdp_get_port_from_url($hdfs_site["dfs.datanode.http.address"])
++ $journalnode_port = hdp_get_port_from_url($hdfs_site["dfs.journalnode.http-address"])
+ } else {
+ $namenode_port = "50070"
+ $snamenode_port = "50090"
+@@ -55,25 +55,25 @@ class hdp(
+ }
+
+ if has_key($configuration, 'mapred-site') {
+- $mapred-site = $configuration['mapred-site']
++ $mapred_site = $configuration['mapred-site']
+
+ if (hdp_get_major_stack_version($stack_version) >= 2) {
+- $jtnode_port = hdp_get_port_from_url($mapred-site["mapreduce.jobtracker.http.address"],"50030")
+- $tasktracker_port = hdp_get_port_from_url($mapred-site["mapreduce.tasktracker.http.address"],"50060")
++ $jtnode_port = hdp_get_port_from_url($mapred_site["mapreduce.jobtracker.http.address"],"50030")
++ $tasktracker_port = hdp_get_port_from_url($mapred_site["mapreduce.tasktracker.http.address"],"50060")
+ } else {
+- $jtnode_port = hdp_get_port_from_url($mapred-site["mapred.job.tracker.http.address"],"50030")
+- $tasktracker_port = hdp_get_port_from_url($mapred-site["mapred.task.tracker.http.address"],"50060")
++ $jtnode_port = hdp_get_port_from_url($mapred_site["mapred.job.tracker.http.address"],"50030")
++ $tasktracker_port = hdp_get_port_from_url($mapred_site["mapred.task.tracker.http.address"],"50060")
+ }
+- $jobhistory_port = hdp_get_port_from_url($mapred-site["mapreduce.history.server.http.address"],"51111")
++ $jobhistory_port = hdp_get_port_from_url($mapred_site["mapreduce.history.server.http.address"],"51111")
+
+- $hs_port = hdp_get_port_from_url($mapred-site["mapreduce.jobhistory.webapp.address"],"19888")
++ $hs_port = hdp_get_port_from_url($mapred_site["mapreduce.jobhistory.webapp.address"],"19888")
+ }
+
+ if has_key($configuration, 'yarn-site') {
+- $yarn-site = $configuration['yarn-site']
+- $rm_port = hdp_get_port_from_url($yarn-site["yarn.resourcemanager.webapp.address"],"8088")
+- $rm_https_port = hdp_get_port_from_url($yarn-site["yarn.resourcemanager.webapp.https.address"],"8090")
+- $nm_port = hdp_get_port_from_url($yarn-site["yarn.nodemanager.webapp.address"],"8042")
++ $yarn_site = $configuration['yarn-site']
++ $rm_port = hdp_get_port_from_url($yarn_site["yarn.resourcemanager.webapp.address"],"8088")
++ $rm_https_port = hdp_get_port_from_url($yarn_site["yarn.resourcemanager.webapp.https.address"],"8090")
++ $nm_port = hdp_get_port_from_url($yarn_site["yarn.nodemanager.webapp.address"],"8042")
+ }
+
+ $hbase_master_port = hdp_default("hbase-site/hbase.master.info.port","60010")
+diff --git a/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp b/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp
+index 012b559..05f8b29 100644
+--- a/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp
++++ b/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp
+@@ -27,16 +27,16 @@ class hdp::params()
+
+ ###### environment variables
+ if (hdp_is_empty($configuration) == false) {
+- $core-site = $configuration['core-site']
+- $hbase-site = $configuration['hbase-site']
+- $hdfs-site = $configuration['hdfs-site']
+- $hive-site = $configuration['hive-site']
+- $hue-site = $configuration['hue-site']
+- $mapred-site = $configuration['mapred-site']
+- $oozie-site = $configuration['oozie-site']
+- $sqoop-site = $configuration['sqoop-site']
+- $webhcat-site = $configuration['webhcat-site']
+- $yarn-site = $configuration['yarn-site']
++ $core_site = $configuration['core-site']
++ $hbase_site = $configuration['hbase-site']
++ $hdfs_site = $configuration['hdfs-site']
++ $hive_site = $configuration['hive-site']
++ $hue_site = $configuration['hue-site']
++ $mapred_site = $configuration['mapred-site']
++ $oozie_site = $configuration['oozie-site']
++ $sqoop_site = $configuration['sqoop-site']
++ $webhcat_site = $configuration['webhcat-site']
++ $yarn_site = $configuration['yarn-site']
+ }
+
+ ## Stack version
diff --git a/ambari.spec b/ambari.spec
index e1a1841..40385b9 100644
--- a/ambari.spec
+++ b/ambari.spec
@@ -1,13 +1,13 @@
# sitelib for noarch packages, sitearch for others (remove the unneeded one)
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
-%bcond_with agent
-
-%global hdp_build 23
+%global hdp_build 110
+%global jetty7 7.6.7.v20120910
+%global jetty8 8.1.14.v20131031
Name: ambari
-Version: 1.4.4
-Release: 2%{?dist}
+Version: 1.5.1
+Release: 1%{?dist}
Summary: Apache Hadoop cluster management
License: ASL 2.0 and MS-PL and MIT
@@ -16,14 +16,10 @@ Source0: http://www.apache.org/dist/%{name}/%{name}-%{version}/%{name}-%{
Source1: %{name}.service
Source2: %{name}.logrotate
-Patch0: %{name}-AMBARI-3567-ambari-web-public.patch
-Patch1: %{name}-static-web-profile.patch
-Patch2: %{name}-jetty7-8-mods.patch
-Patch3: %{name}-maven-assembly-plugin-mods.patch
-Patch4: %{name}-os-lookup.patch
-%if %{with agent}
-Patch5: %{name}-puppet-syntax-remove-hyphens.patch
-%endif
+Patch0: %{name}-jetty7-8-mods.patch
+Patch1: %{name}-jpa-nullable-adjustment.patch
+Patch2: %{name}-maven-assembly-plugin-mods.patch
+Patch3: %{name}-puppet-syntax-remove-hyphens.patch
BuildRequires: java-devel
BuildRequires: python
@@ -35,10 +31,12 @@ BuildRequires: exec-maven-plugin
BuildRequires: fontawesome-fonts
BuildRequires: google-gson
BuildRequires: guice-assistedinject
+BuildRequires: guice-multibindings
BuildRequires: guice-persist
BuildRequires: guice-servlet
BuildRequires: jackson
BuildRequires: jetty8
+BuildRequires: jsr-311
BuildRequires: maven-assembly-plugin
BuildRequires: maven-install-plugin
BuildRequires: maven-local
@@ -49,6 +47,7 @@ BuildRequires: postgresql-jdbc
BuildRequires: powermock-junit4
BuildRequires: powermock-reflect
BuildRequires: python-setuptools
+BuildRequires: quartz
BuildRequires: springframework-security
BuildRequires: xmvn
@@ -64,27 +63,34 @@ easy-to-use Hadoop management web UI backed by its RESTful APIs.
%package server
Summary: Server module for %{name}
+Requires: %{name}
Requires: fontawesome-fonts
Requires: postgresql-server
%description server
%{summary}.
-%if %{with agent}
%package agent
Summary: Agent module for %{name}
+Requires: %{name}
Requires: python-jinja2
Requires: openssl
Requires: puppet
Requires: zlib
%description agent
%{summary}.
-%endif
%package client
Summary: Client module for %{name}
+Requires: %{name}
%description client
%{summary}.
+%package views
+Summary: Views module for %{name}
+Requires: %{name}
+%description views
+%{summary}.
+
%package javadoc
Summary: Javadoc for %{name}
%description javadoc
@@ -97,10 +103,6 @@ This package contains javadoc for %{name}.
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
-%if %{with agent}
-%patch5 -p1
-%endif
find -name '*.jar' -delete
find -name '.git*' -delete
@@ -109,6 +111,14 @@ find -name '.git*' -delete
rm -fr ambari-common/src/main/python/jinja2*
# remove unnecessary, missing or broken plugins and extensions
+%pom_remove_plugin org.apache.rat:apache-rat-plugin
+%pom_remove_plugin org.apache.rat:apache-rat-plugin %{name}-views/examples
+%pom_remove_plugin org.vafer:jdeb
+for f in project views server client; do
+ %pom_remove_plugin org.apache.rat:apache-rat-plugin %{name}-$f
+ %pom_remove_plugin org.vafer:jdeb %{name}-$f
+done
+
%pom_remove_plugin :maven-assembly-plugin
%pom_remove_plugin :rpm-maven-plugin
%pom_remove_plugin :rpm-maven-plugin ambari-server
@@ -117,20 +127,19 @@ rm -fr ambari-common/src/main/python/jinja2*
%pom_remove_plugin :rpm-maven-plugin ambari-client
%pom_xpath_remove "pom:extension[pom:artifactId[text()='wagon-ssh-external']]" ambari-client
-%if %{with agent}
+# jobs classes still inside quartz
+%pom_remove_dep "org.quartz-scheduler:quartz-jobs" ambari-server
+
%pom_remove_plugin :rpm-maven-plugin ambari-agent
%pom_remove_plugin :buildnumber-maven-plugin ambari-agent
%pom_xpath_remove "pom:extension[pom:artifactId[text()='wagon-ssh-external']]" ambari-agent
%pom_remove_plugin :copy-maven-plugin ambari-agent
+%pom_remove_plugin org.vafer:jdeb ambari-agent
# hack the agent code to think it's reporting redhat6 for compat
sed -i 's/self.getOperatingSystem()/"redhat"/' ./ambari-agent/src/main/python/ambari_agent/Facter.py
sed -i 's/self.getOperatingSystemRelease()/6/' ./ambari-agent/src/main/python/ambari_agent/Facter.py
-%else
-%pom_disable_module ambari-agent
-%endif
-
# convert for target python_version
find -name '*.py' -o -name '*.xml' -exec sed -i "s|/usr/bin/python2.6|%{__python}|g" {} \;
find -name '*.py' -exec sed -i "s|/env python2.6|/env %{__python}|g" {} \;
@@ -139,6 +148,12 @@ find -name '*.py' -o -name '*.xml' -o -name '*.js' -o -name '*.script' \
-exec sed -i "s|lib/python2.6|lib/python%{python_version}|g" {} \;
sed -i "s|lib/python2.6|lib/python%{python_version}|g" ./ambari-server/conf/unix/ambari.properties
+%pom_add_dep javax.ws.rs:jsr311-api: ambari-views
+%pom_remove_plugin :maven-assembly-plugin ambari-views
+
+# push to jetty8 compat
+sed -i "s|<version>%{jetty7}</version>|<version>%{jetty8}</version>|g" ambari-project/pom.xml
+
%build
# Separate packages for POM files
@@ -157,7 +172,9 @@ sed -i 's/\${ambariVersion}/%{version}.%{hdp_build}/g' ./ambari-server/sbin/amba
install -d -m 0755 %{buildroot}%{_sbindir}
-%if %{with agent}
+# ambari
+install -d -m 0755 %{buildroot}%{python_sitelib}/common_functions
+cp -pr ambari-common/src/main/python/common_functions/* %{buildroot}%{python_sitelib}/common_functions
sed -i 's/\${ambariVersion}/%{version}.%{hdp_build}/g' ./ambari-agent/conf/unix/ambari-agent
@@ -190,8 +207,6 @@ cp -pr ambari-server/src/main/resources/stacks %{buildroot}%{_var}/lib/ambari-ag
# add agent var data files
cp -p version %{buildroot}%{_var}/lib/ambari-agent/data
-cp -p ambari-server/src/main/resources/custom_actions/hdfs_rebalance.py %{buildroot}%{_var}/lib/ambari-agent/resources
-%endif
# ambari-client
install -d -m 0755 %{buildroot}%{_datadir}/%{name}/ambari-client/examples
@@ -242,15 +257,14 @@ for f in $PY_FILES; do
sed -i '1i #!/bin/env python' $f
done
# random stragglers
-chmod a+x src/main/resources/stacks/HDP/2.0._/services/NAGIOS/package/templates/nagios.j2
-chmod a+x src/main/resources/stacks/HDP/2.0._/services/NAGIOS/package/files/check_cpu.pl
+chmod a+x src/main/resources/stacks/HDP/2.*/services/NAGIOS/package/templates/nagios.j2
+chmod a+x src/main/resources/stacks/HDP/2.*/services/NAGIOS/package/files/check_cpu.pl
cp -p src/main/resources/*.{sql,json} %{buildroot}%{_var}/lib/ambari-server/resources
-cp -pr src/main/resources/{scripts,stacks,upgrade} %{buildroot}%{_var}/lib/ambari-server/resources
-# zero-length file
-rm src/main/resources/db/index.txt
+cp -pr src/main/resources/{custom_action_definitions,custom_actions,db,scripts,stacks,upgrade} %{buildroot}%{_var}/lib/ambari-server/resources
+# zero-length file needed for openssl ca cmd
+# rm src/main/resources/db/index.txt
cp -pr src/main/resources/db %{buildroot}%{_var}/lib/ambari-server/keys
-cp -p src/main/resources/custom_actions/hdfs_rebalance.py %{buildroot}%{_var}/lib/ambari-server/resources
sed -i 's|/usr/bin/python2.6|%{__python}|g' sbin/ambari-server
sed -i 's|/usr/sbin/ambari-server.py|%{_datadir}/%{name}/ambari-server/sbin/ambari-server.py|g' \
@@ -263,8 +277,12 @@ ln -s %{_datadir}/%{name}/ambari-server/sbin/ambari-server %{buildroot}%{_sbindi
sed -i 's|/usr/lib/ambari-server|%{_datadir}/%{name}/ambari-server/lib|g' src/main/python/ambari-server.py
# no egg info for ambari-server
install -p src/main/python/ambari-server.py %{buildroot}%{_datadir}/%{name}/ambari-server/sbin
-chmod +x src/main/python/os_type_check.sh
-cp -p src/main/python/{bootstrap.py,setupAgent.py,os_type_check.sh} %{buildroot}%{python_sitelib}/ambari_server
+chmod a+x src/main/python/*.py
+cp -p src/main/python/{*.py,ambari_server/*.py} %{buildroot}%{python_sitelib}/ambari_server
+
+# need to fix-up the web client version since upstream gives us the js statically
+sed -i "s/App.version.*=.*;/App.version = '%{version}.%{hdp_build}';/" ../ambari-web/public-static/javascripts/app.js
+gzip -c ../ambari-web/public-static/javascripts/app.js > ../ambari-web/public-static/javascripts/app.js.gz
# zero-length file
rm ../ambari-web/public-static/data/apps/jobs.json
@@ -279,7 +297,8 @@ ln -s %{_datadir}/fonts/fontawesome/fontawesome-webfont.ttf \
# TODO: revisit this mapping hack
echo "server.os_type=redhat6" >> conf/unix/ambari.properties
-cp -p conf/unix/*.properties %{buildroot}%{_sysconfdir}/ambari-server/conf
+cp -p conf/unix/{*.properties,krb5JAASLogin.conf} %{buildroot}%{_sysconfdir}/ambari-server/conf
+cp -p conf/unix/ca.config %{buildroot}%{_var}/lib/ambari-server/keys
# make system softlinks for dependent jars
mv target/DBConnectionVerification.jar %{buildroot}%{_javadir}/%{name}
@@ -302,6 +321,7 @@ cp -p version %{buildroot}%{_var}/lib/ambari-server/resources
%files -f .mfiles
%doc NOTICE.txt LICENSE.txt
+%{python_sitelib}/common_functions
%files server -f .mfiles-ambari-server
%{_sbindir}/%{name}-server
@@ -317,7 +337,6 @@ cp -p version %{buildroot}%{_var}/lib/ambari-server/resources
%config(noreplace) %attr(644, root, root) %{_sysconfdir}/logrotate.d/%{name}-server
%{_javadir}/%{name}/DBConnectionVerification.jar
-%if %{with agent}
%files agent -f .mfiles-ambari-agent
%{_sbindir}/%{name}-agent
%{python_sitelib}/ambari_agent*
@@ -327,16 +346,21 @@ cp -p version %{buildroot}%{_var}/lib/ambari-server/resources
%{_var}/run/ambari-agent
%{_datadir}/%{name}/ambari-agent
%{_sysconfdir}/ambari-agent
-%endif
%files client -f .mfiles-ambari-client
%{python_sitelib}/ambari_client*
%{_datadir}/%{name}/ambari-client
+%files views -f .mfiles-ambari-views
+
%files javadoc -f .mfiles-javadoc
%doc NOTICE.txt LICENSE.txt
%changelog
+* Fri Apr 25 2014 Peter MacKinnon <pmackinn at redhat.com> 1.5.1-1
+- update to 1.5.1 (HDP build 110)
+- enable agent build
+
* Tue Apr 22 2014 Peter MacKinnon <pmackinn at redhat.com> 1.4.4-2
- enable vendor scripts (FPC #415 exception granted)
diff --git a/sources b/sources
index 954f0f3..fd09eb4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cfd97b282fb92cb76eb8630d7434ef8f ambari-1.4.4.tar.gz
+e498a6da54413ba9bc80c59a88de7dec ambari-1.5.1.tar.gz
More information about the scm-commits
mailing list