diff options
| -rw-r--r-- | bigtop-deploy/puppet/hieradata/bigtop/cluster.yaml | 6 | ||||
| -rw-r--r-- | bigtop-deploy/puppet/hieradata/site.yaml | 1 | ||||
| -rw-r--r-- | bigtop-deploy/puppet/manifests/cluster.pp | 9 | ||||
| -rw-r--r-- | bigtop-deploy/puppet/modules/hue/manifests/init.pp | 2 | ||||
| -rw-r--r-- | bigtop-deploy/puppet/modules/hue/templates/hue.ini | 4 | ||||
| -rw-r--r-- | bigtop-deploy/puppet/modules/hue/tests/init.pp | 2 | ||||
| -rw-r--r-- | bigtop-deploy/puppet/modules/sqoop/manifests/init.pp (renamed from bigtop-deploy/puppet/modules/hadoop-sqoop/tests/init.pp) | 9 | ||||
| -rw-r--r-- | bigtop-deploy/puppet/modules/sqoop/tests/init.pp | 16 | ||||
| -rw-r--r-- | bigtop-deploy/puppet/modules/sqoop2/manifests/init.pp (renamed from bigtop-deploy/puppet/modules/hadoop-sqoop/manifests/init.pp) | 10 | ||||
| -rw-r--r-- | bigtop-deploy/puppet/modules/sqoop2/tests/init.pp | 17 |
10 files changed, 59 insertions, 17 deletions
diff --git a/bigtop-deploy/puppet/hieradata/bigtop/cluster.yaml b/bigtop-deploy/puppet/hieradata/bigtop/cluster.yaml index 44cb1b77..aaa4a068 100644 --- a/bigtop-deploy/puppet/hieradata/bigtop/cluster.yaml +++ b/bigtop-deploy/puppet/hieradata/bigtop/cluster.yaml @@ -16,7 +16,7 @@ # "$components" list. If $components isn't set then everything in the stack will # be installed as usual. Otherwise only a specified list will be set # Possible elements: -# hadoop,yarn,hbase,tachyon,flume,solrcloud,spark,oozie,hcat,sqoop,httpfs, +# hadoop,yarn,hbase,tachyon,flume,solrcloud,spark,oozie,hcat,sqoop,sqoop2,httpfs, # hue,mahout,giraph,crunch,pig,hive,zookeeper # Example (to deploy only HDFS and YARN server and gateway parts) # This can be a comma-separated list or an array. @@ -115,7 +115,7 @@ hadoop-zookeeper::server::kerberos_realm: "%{hiera('kerberos::site::realm')}" bigtop::hadoop_rm_http_port: "8088" bigtop::hadoop_rm_proxy_port: "8088" bigtop::hadoop_history_server_port: "19888" -bigtop::sqoop_server_port: "<never defined correctly>" +bigtop::sqoop2_server_port: "12000" bigtop::hbase_thrift_port: "9090" bigtop::hadoop_oozie_port: "11000" @@ -127,7 +127,7 @@ hue::server::history_server_url: "http://%{hiera('bigtop::hadoop_head_node')}:%{ # those use fqdn instead of hadoop_head_node because it's only ever activated # on the gatewaynode hue::server::webhdfs_url: "http://%{fqdn}:%{hiera('hadoop::httpfs::hadoop_httpfs_port')}/webhdfs/v1" -hue::server::sqoop_url: "http://%{fqdn}:%{hiera('bigtop::sqoop_server_port')}/sqoop" +hue::server::sqoop2_url: "http://%{fqdn}:%{hiera('bigtop::sqoop2_server_port')}/sqoop" hue::server::solr_url: "http://%{fqdn}:%{hiera('solr::server::port')}/solr/" hue::server::hbase_thrift_url: "%{fqdn}:%{hiera('bigtop::hbase_thrift_port')}" hue::server::oozie_url: "http://%{hiera('bigtop::hadoop_head_node')}:%{hiera('bigtop::hadoop_oozie_port')}/oozie" diff --git a/bigtop-deploy/puppet/hieradata/site.yaml b/bigtop-deploy/puppet/hieradata/site.yaml index 00861c44..826d7489 100644 --- a/bigtop-deploy/puppet/hieradata/site.yaml +++ b/bigtop-deploy/puppet/hieradata/site.yaml @@ -28,6 +28,7 @@ hadoop::hadoop_storage_dirs: # - solrcloud # - spark # - sqoop +# - sqoop2 # - tachyon # - tez # - yarn diff --git a/bigtop-deploy/puppet/manifests/cluster.pp b/bigtop-deploy/puppet/manifests/cluster.pp index 35ef1956..77cbbcfa 100644 --- a/bigtop-deploy/puppet/manifests/cluster.pp +++ b/bigtop-deploy/puppet/manifests/cluster.pp @@ -161,8 +161,8 @@ class standby_head_node inherits hadoop_cluster_node { } class hadoop_gateway_node inherits hadoop_cluster_node { - if ($all or "sqoop" in $components) { - include hadoop-sqoop::server + if ($all or "sqoop2" in $components) { + include sqoop2::server } if ($all or "httpfs" in $components) { @@ -196,8 +196,11 @@ class hadoop_gateway_node inherits hadoop_cluster_node { if ($all or "hive" in $components) { include hadoop-hive::client } + if ($all or "sqoop2" in $components) { + include sqoop2::client + } if ($all or "sqoop" in $components) { - include hadoop-sqoop::client + include sqoop::client } if ($all or "oozie" in $components) { include hadoop-oozie::client diff --git a/bigtop-deploy/puppet/modules/hue/manifests/init.pp b/bigtop-deploy/puppet/modules/hue/manifests/init.pp index 4fd9c1c7..687a055b 100644 --- a/bigtop-deploy/puppet/modules/hue/manifests/init.pp +++ b/bigtop-deploy/puppet/modules/hue/manifests/init.pp @@ -14,7 +14,7 @@ # limitations under the License. class hue { - class server($sqoop_url = "http://localhost:12000/sqoop", $solr_url = "http://localhost:8983/solr/", $hbase_thrift_url = "", + class server($sqoop2_url = "http://localhost:12000/sqoop", $solr_url = "http://localhost:8983/solr/", $hbase_thrift_url = "", $webhdfs_url, $rm_host, $rm_port, $oozie_url, $rm_proxy_url, $history_server_url, $hive_host = "", $hive_port = "10000", $rm_logical_name = undef, $rm_api_port = "8088", $app_blacklist = "impala, security", diff --git a/bigtop-deploy/puppet/modules/hue/templates/hue.ini b/bigtop-deploy/puppet/modules/hue/templates/hue.ini index fe1b4723..93c82fc3 100644 --- a/bigtop-deploy/puppet/modules/hue/templates/hue.ini +++ b/bigtop-deploy/puppet/modules/hue/templates/hue.ini @@ -746,8 +746,8 @@ # For autocompletion, fill out the librdbms section. # Sqoop server URL -<% if @sqoop_url != "" -%> - server_url=<%= @sqoop_url %> +<% if @sqoop2_url != "" -%> + server_url=<%= @sqoop2_url %> <% end -%> ########################################################################### diff --git a/bigtop-deploy/puppet/modules/hue/tests/init.pp b/bigtop-deploy/puppet/modules/hue/tests/init.pp index 7007ea08..38fa1a00 100644 --- a/bigtop-deploy/puppet/modules/hue/tests/init.pp +++ b/bigtop-deploy/puppet/modules/hue/tests/init.pp @@ -14,7 +14,7 @@ # limitations under the License. hue::server { "test-hue-server": - sqoop_url => "http://localhost:12000/sqoop", + sqoop2_url => "http://localhost:12000/sqoop", solr_url => "http://localhost:8983/solr/", hbase_thrift_url => "localhost:9090", webhdfs_url => "http://localhost:14000/webhdfs/v1", diff --git a/bigtop-deploy/puppet/modules/hadoop-sqoop/tests/init.pp b/bigtop-deploy/puppet/modules/sqoop/manifests/init.pp index 442323eb..d7e8011b 100644 --- a/bigtop-deploy/puppet/modules/hadoop-sqoop/tests/init.pp +++ b/bigtop-deploy/puppet/modules/sqoop/manifests/init.pp @@ -13,5 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -hadoop-sqoop::client { "test-sqoop-client": } -hadoop-sqoop::server { "test-sqoop-server": } +class sqoop { + class client { + package { "sqoop": + ensure => latest, + } + } +} diff --git a/bigtop-deploy/puppet/modules/sqoop/tests/init.pp b/bigtop-deploy/puppet/modules/sqoop/tests/init.pp new file mode 100644 index 00000000..19810bc6 --- /dev/null +++ b/bigtop-deploy/puppet/modules/sqoop/tests/init.pp @@ -0,0 +1,16 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +sqoop::client { "test-sqoop-client": } diff --git a/bigtop-deploy/puppet/modules/hadoop-sqoop/manifests/init.pp b/bigtop-deploy/puppet/modules/sqoop2/manifests/init.pp index e0223ba2..9648483f 100644 --- a/bigtop-deploy/puppet/modules/hadoop-sqoop/manifests/init.pp +++ b/bigtop-deploy/puppet/modules/sqoop2/manifests/init.pp @@ -13,21 +13,21 @@ # See the License for the specific language governing permissions and # limitations under the License. -class hadoop-sqoop { +class sqoop2 { class client { - package { "sqoop-client": + package { "sqoop2-client": ensure => latest, } } class server { - package { "sqoop-server": + package { "sqoop2-server": ensure => latest, } - service { "sqoop-server": + service { "sqoop2-server": ensure => running, - require => Package["sqoop-server"], + require => Package["sqoop2-server"], hasstatus => true, hasrestart => true, } diff --git a/bigtop-deploy/puppet/modules/sqoop2/tests/init.pp b/bigtop-deploy/puppet/modules/sqoop2/tests/init.pp new file mode 100644 index 00000000..6263f6a9 --- /dev/null +++ b/bigtop-deploy/puppet/modules/sqoop2/tests/init.pp @@ -0,0 +1,17 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +sqoop2::client { "test-sqoop2-client": } +sqoop2::server { "test-sqoop2-server": } |