Ottomata has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/402424 )
Change subject: Fixes to better configure hadoop.proxyuser
......................................................................
Fixes to better configure hadoop.proxyuser
- remove unused and hardcoded llama impala user
- always configure hue and oozie proxyusers (no-op)
- conditionally render httpfs user (no-op)
- add core_site_extra_properties param to add other properties, including more
proxyusers
This will be used to let superset proxy the logged in LDAP user
when running queries, so users can issue hive queries.
Change-Id: I0eede05bd221975a2fc4c7bcd7c5b8bbf5478fac
---
M manifests/hadoop.pp
M manifests/hadoop/defaults.pp
M templates/hadoop/core-site.xml.erb
3 files changed, 29 insertions(+), 26 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet/cdh
refs/changes/24/402424/1
diff --git a/manifests/hadoop.pp b/manifests/hadoop.pp
index 48b22aa..15fa918 100644
--- a/manifests/hadoop.pp
+++ b/manifests/hadoop.pp
@@ -124,6 +124,10 @@
# $fair_scheduler_template - The fair-scheduler.xml queue
configuration template.
# If you set this to false or
undef, FairScheduler will
# be disabled. Default:
cdh/hadoop/fair-scheduler.xml.erb
+#
+# $core_site_extra_properties - Hash of extra property names
to values that will be
+# be rendered in
core-site.xml.erb. Default: undef
+#
# $yarn_site_extra_properties - Hash of extra property names
to values that will be
# be rendered in
yarn-site.xml.erb. Default: undef
#
@@ -191,6 +195,7 @@
$gelf_logging_host =
$::cdh::hadoop::defaults::gelf_logging_host,
$gelf_logging_port =
$::cdh::hadoop::defaults::gelf_logging_port,
$fair_scheduler_template =
$::cdh::hadoop::defaults::fair_scheduler_template,
+ $core_site_extra_properites =
$::cdh::hadoop::defaults::core_site_extra_properties,
$yarn_site_extra_properties =
$::cdh::hadoop::defaults::yarn_site_extra_properties,
) inherits cdh::hadoop::defaults
{
diff --git a/manifests/hadoop/defaults.pp b/manifests/hadoop/defaults.pp
index 617d41e..e1807b5 100644
--- a/manifests/hadoop/defaults.pp
+++ b/manifests/hadoop/defaults.pp
@@ -60,6 +60,7 @@
$yarn_log_aggregation_retain_check_interval_seconds = 86400
$fair_scheduler_template =
'cdh/hadoop/fair-scheduler.xml.erb'
+ $core_site_extra_properties = undef
$yarn_site_extra_properties = undef
$hadoop_heapsize = undef
diff --git a/templates/hadoop/core-site.xml.erb
b/templates/hadoop/core-site.xml.erb
index a8df776..a4b777e 100644
--- a/templates/hadoop/core-site.xml.erb
+++ b/templates/hadoop/core-site.xml.erb
@@ -17,16 +17,25 @@
<name>ha.zookeeper.quorum</name>
<value><%= Array(@zookeeper_hosts).sort.join(',') %></value>
</property>
-<% end -%>
+<% end -%>
<% if @io_file_buffer_size -%>
<property>
<name>io.file.buffer.size</name>
<value><%= @io_file_buffer_size %></value>
</property>
-<% end -%>
-<% if @webhdfs_enabled or @httpfs_enabled -%>
+<% end -%>
+ <!-- mapred proxy user -->
+ <property>
+ <name>hadoop.proxyuser.mapred.hosts</name>
+ <value>*</value>
+ </property>
+ <property>
+ <name>hadoop.proxyuser.mapred.groups</name>
+ <value>*</value>
+ </property>
+
<!-- Hue proxy user -->
<property>
<name>hadoop.proxyuser.hue.hosts</name>
@@ -46,9 +55,9 @@
<name>hadoop.proxyuser.oozie.groups</name>
<value>*</value>
</property>
-<% end -%>
<% if @httpfs_enabled -%>
+ <!-- httpfs proxy user -->
<property>
<name>hadoop.proxyuser.httpfs.hosts</name>
<value>*</value>
@@ -57,34 +66,22 @@
<name>hadoop.proxyuser.httpfs.groups</name>
<value>*</value>
</property>
+
<% end -%>
-
- <!-- mapred proxy user -->
- <property>
- <name>hadoop.proxyuser.mapred.hosts</name>
- <value>*</value>
- </property>
- <property>
- <name>hadoop.proxyuser.mapred.groups</name>
- <value>*</value>
- </property>
-
- <!-- llama (impala) proxy user -->
- <property>
- <name>hadoop.proxyuser.llama.hosts</name>
- <value>*</value>
- </property>
- <property>
- <name>hadoop.proxyuser.llama.groups</name>
- <value>*</value>
- </property>
-
<% if @net_topology_script_template -%>
<!-- Script used to map nodes to rack or rows in datacenter. -->
<property>
<name>net.topology.script.file.name</name>
<value><%= @net_topology_script_path %></value>
</property>
-<% end -%>
+<% end -%>
+<% if @core_site_extra_properties -%>
+<% @core_site_extra_properties.sort.map do |key, value| -%>
+ <property>
+ <name><%= key %></name>
+ <value><%= value %></value>
+ </property>
+
+<% end -%>
</configuration>
--
To view, visit https://gerrit.wikimedia.org/r/402424
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0eede05bd221975a2fc4c7bcd7c5b8bbf5478fac
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet/cdh
Gerrit-Branch: master
Gerrit-Owner: Ottomata <ao...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
