You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by of...@apache.org on 2016/04/26 21:54:15 UTC
[1/3] bigtop git commit: BIGTOP-2408 : group_filter variable value is
not templatize in puppet module of hue
Repository: bigtop
Updated Branches:
refs/heads/master 6e9630ca4 -> 67bc8230a
BIGTOP-2408 : group_filter variable value is not templatize in puppet module of hue
Signed-off-by: Olaf Flebbe <of...@fleb.be>
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/66fdf287
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/66fdf287
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/66fdf287
Branch: refs/heads/master
Commit: 66fdf2871602cec7f718bc0bc3dd0ede1846f63b
Parents: 6e9630c
Author: Amit Kabra <ak...@a1kabra-wsl.internal.salesforce.com>
Authored: Mon Apr 25 14:34:36 2016 +0530
Committer: Olaf Flebbe <of...@fleb.be>
Committed: Tue Apr 26 21:45:37 2016 +0200
----------------------------------------------------------------------
bigtop-deploy/puppet/modules/hue/manifests/init.pp | 1 +
bigtop-deploy/puppet/modules/hue/templates/hue.ini | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/66fdf287/bigtop-deploy/puppet/modules/hue/manifests/init.pp
----------------------------------------------------------------------
diff --git a/bigtop-deploy/puppet/modules/hue/manifests/init.pp b/bigtop-deploy/puppet/modules/hue/manifests/init.pp
index c7f1603..85c1b95 100644
--- a/bigtop-deploy/puppet/modules/hue/manifests/init.pp
+++ b/bigtop-deploy/puppet/modules/hue/manifests/init.pp
@@ -31,6 +31,7 @@ class hue {
$hive_host = "", $hive_port = "10000",
$zookeeper_host_port = "localhost:2181",
$force_username_lowercase = "false",
+ $group_filter_value = "objectclass=groupOfEntries",
$rm_logical_name = undef, $rm_api_port = "8088", $app_blacklist = "impala, security",
$hue_host = "0.0.0.0", $hue_port = "8888", $hue_timezone = "America/Los_Angeles",
$default_fs = "hdfs://localhost:8020",
http://git-wip-us.apache.org/repos/asf/bigtop/blob/66fdf287/bigtop-deploy/puppet/modules/hue/templates/hue.ini
----------------------------------------------------------------------
diff --git a/bigtop-deploy/puppet/modules/hue/templates/hue.ini b/bigtop-deploy/puppet/modules/hue/templates/hue.ini
index 39260a7..7979572 100644
--- a/bigtop-deploy/puppet/modules/hue/templates/hue.ini
+++ b/bigtop-deploy/puppet/modules/hue/templates/hue.ini
@@ -282,7 +282,7 @@
# Base filter for searching for groups
<% if @group_filter -%>
- group_filter="objectclass=groupOfEntries"
+ group_filter="<%= @group_filter_value %>"
<% end -%>
# The group name attribute in the LDAP schema
[3/3] bigtop git commit: BIGTOP-2410 : Making ldap_username_pattern
variable templatize in puppet module of hue
Posted by of...@apache.org.
BIGTOP-2410 : Making ldap_username_pattern variable templatize in puppet module of hue
Signed-off-by: Olaf Flebbe <of...@fleb.be>
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/67bc8230
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/67bc8230
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/67bc8230
Branch: refs/heads/master
Commit: 67bc8230afcccfaebe5ddc9bd5457fa4542d27b3
Parents: 30001c3
Author: Amit Kabra <am...@gmail.com>
Authored: Tue Apr 26 11:47:08 2016 +0530
Committer: Olaf Flebbe <of...@fleb.be>
Committed: Tue Apr 26 21:45:46 2016 +0200
----------------------------------------------------------------------
bigtop-deploy/puppet/modules/hue/manifests/init.pp | 2 ++
bigtop-deploy/puppet/modules/hue/templates/hue.ini | 6 +++++-
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/67bc8230/bigtop-deploy/puppet/modules/hue/manifests/init.pp
----------------------------------------------------------------------
diff --git a/bigtop-deploy/puppet/modules/hue/manifests/init.pp b/bigtop-deploy/puppet/modules/hue/manifests/init.pp
index c4f70ca..2b11d2f 100644
--- a/bigtop-deploy/puppet/modules/hue/manifests/init.pp
+++ b/bigtop-deploy/puppet/modules/hue/manifests/init.pp
@@ -33,6 +33,8 @@ class hue {
$force_username_lowercase = "false",
$group_filter_value = "objectclass=groupOfEntries",
$nt_domain = undef,
+ $use_ldap_username_pattern = false,
+ $ldap_username_pattern = undef,
$rm_logical_name = undef, $rm_api_port = "8088", $app_blacklist = "impala, security",
$hue_host = "0.0.0.0", $hue_port = "8888", $hue_timezone = "America/Los_Angeles",
$default_fs = "hdfs://localhost:8020",
http://git-wip-us.apache.org/repos/asf/bigtop/blob/67bc8230/bigtop-deploy/puppet/modules/hue/templates/hue.ini
----------------------------------------------------------------------
diff --git a/bigtop-deploy/puppet/modules/hue/templates/hue.ini b/bigtop-deploy/puppet/modules/hue/templates/hue.ini
index 30269b2..41045ba 100644
--- a/bigtop-deploy/puppet/modules/hue/templates/hue.ini
+++ b/bigtop-deploy/puppet/modules/hue/templates/hue.ini
@@ -234,8 +234,12 @@
<% else -%>
# Pattern for searching for usernames -- Use <username> for the parameter
# For use when using LdapBackend for Hue authentication
- # ldap_username_pattern="uid=<username>,ou=People,dc=mycompany,dc=com"
+<% if @use_ldap_username_pattern -%>
+ # for example, ldap_username_pattern=uid=<username>,ou=People,dc=mycompany,dc=com
+ ldap_username_pattern="<%= @ldap_username_pattern %>"
+<% end -%>
+
search_bind_authentication=false
<% end -%>
# Execute this script to produce the bind user password. This will be used
[2/3] bigtop git commit: BIGTOP-2409 : nt_domain configuration option
for hue to connect to Active Directory
Posted by of...@apache.org.
BIGTOP-2409 : nt_domain configuration option for hue to connect to Active Directory
Signed-off-by: Olaf Flebbe <of...@fleb.be>
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/30001c32
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/30001c32
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/30001c32
Branch: refs/heads/master
Commit: 30001c324cacd71e65e8d53fa9804b5ce49d8f55
Parents: 66fdf28
Author: Amit Kabra <ak...@a1kabra-wsl.internal.salesforce.com>
Authored: Mon Apr 25 15:14:35 2016 +0530
Committer: Olaf Flebbe <of...@fleb.be>
Committed: Tue Apr 26 21:45:42 2016 +0200
----------------------------------------------------------------------
bigtop-deploy/puppet/modules/hue/manifests/init.pp | 1 +
bigtop-deploy/puppet/modules/hue/templates/hue.ini | 5 +++++
2 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/30001c32/bigtop-deploy/puppet/modules/hue/manifests/init.pp
----------------------------------------------------------------------
diff --git a/bigtop-deploy/puppet/modules/hue/manifests/init.pp b/bigtop-deploy/puppet/modules/hue/manifests/init.pp
index 85c1b95..c4f70ca 100644
--- a/bigtop-deploy/puppet/modules/hue/manifests/init.pp
+++ b/bigtop-deploy/puppet/modules/hue/manifests/init.pp
@@ -32,6 +32,7 @@ class hue {
$zookeeper_host_port = "localhost:2181",
$force_username_lowercase = "false",
$group_filter_value = "objectclass=groupOfEntries",
+ $nt_domain = undef,
$rm_logical_name = undef, $rm_api_port = "8088", $app_blacklist = "impala, security",
$hue_host = "0.0.0.0", $hue_port = "8888", $hue_timezone = "America/Los_Angeles",
$default_fs = "hdfs://localhost:8020",
http://git-wip-us.apache.org/repos/asf/bigtop/blob/30001c32/bigtop-deploy/puppet/modules/hue/templates/hue.ini
----------------------------------------------------------------------
diff --git a/bigtop-deploy/puppet/modules/hue/templates/hue.ini b/bigtop-deploy/puppet/modules/hue/templates/hue.ini
index 7979572..30269b2 100644
--- a/bigtop-deploy/puppet/modules/hue/templates/hue.ini
+++ b/bigtop-deploy/puppet/modules/hue/templates/hue.ini
@@ -198,6 +198,11 @@
# The search base for finding users and groups
base_dn="<%= @base_dn %>"
+<% if @nt_domain -%>
+ # The NT domain to connect to (only for use with Active Directory)
+ nt_domain=<%= @nt_domain %>
+<% end -%>
+
# URL of the LDAP server
ldap_url=<%= @ldap_url %>