Ottomata has submitted this change and it was merged.
Change subject: Fixing sqoop path based on sqoop or sqoop2
......................................................................
Fixing sqoop path based on sqoop or sqoop2
Change-Id: I397cc4dbf7b0e9c32244871f9390ed452c31b21a
---
M manifests/hue.pp
M templates/hue/hue.ini.erb
2 files changed, 18 insertions(+), 6 deletions(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/hue.pp b/manifests/hue.pp
index f16e2e0..fd74499 100644
--- a/manifests/hue.pp
+++ b/manifests/hue.pp
@@ -156,6 +156,16 @@
}
}
+ if (defined(Package['sqoop'])) {
+ $sqoop = 'sqoop'
+ }
+ elsif (defined(Package['sqoop2'])) {
+ $sqoop = 'sqoop2'
+ }
+ else {
+ $sqoop = false
+ }
+
$namenode_hostname = $cdh4::hadoop::namenode_hostname
file { '/etc/hue/hue.ini':
content => template($hue_ini_template),
diff --git a/templates/hue/hue.ini.erb b/templates/hue/hue.ini.erb
index cbc6803..88689bc 100644
--- a/templates/hue/hue.ini.erb
+++ b/templates/hue/hue.ini.erb
@@ -486,16 +486,18 @@
[[[[[ JAVA_HOME ]]]]]
value = "/usr/lib/jvm/java-6-sun"
- # Define and configure a new shell type "sqoop2"
+<% if @sqoop -%>
+ # Define and configure a new shell type "<%= @sqoop %>"
# ------------------------------------------------------------------------
- [[[ sqoop2 ]]]
- nice_name = "Sqoop2 Shell"
- command = "/usr/bin/sqoop2"
- help = "The command-line Sqoop2 client."
+ [[[ <%= @sqoop %> ]]]
+ nice_name = "<%= @sqoop %> Shell"
+ command = "/usr/bin/<%= @sqoop %>"
+ help = "The command-line <%= @sqoop %> client."
[[[[ environment ]]]]
- # You can configure environment variables for the Sqoop2 shell
+ # You can configure environment variables for the <%= @sqoop %> shell
# in this section.
+<% end # if @sqoop -%>
# Define and configure a new shell type "hbase"
# ------------------------------------------------------------------------
--
To view, visit https://gerrit.wikimedia.org/r/75112
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I397cc4dbf7b0e9c32244871f9390ed452c31b21a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet/cdh4
Gerrit-Branch: master
Gerrit-Owner: Ottomata <[email protected]>
Gerrit-Reviewer: Ottomata <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
