bigtop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c..@apache.org
Subject bigtop git commit: BIGTOP-2325. Deployment recipes for HAWQ
Date Thu, 18 Feb 2016 10:03:07 GMT
Repository: bigtop
Updated Branches:
  refs/heads/BIGTOP-2320 22b8d7656 -> 5fa37edfe


BIGTOP-2325. Deployment recipes for HAWQ

puppet test works now. Time for template fixing.


Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/5fa37edf
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/5fa37edf
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/5fa37edf

Branch: refs/heads/BIGTOP-2320
Commit: 5fa37edfe8597663ecf7e698ab3e3bba74167051
Parents: 22b8d76
Author: Konstantin Boudnik <cos@apache.org>
Authored: Thu Feb 18 13:02:32 2016 +0300
Committer: Konstantin Boudnik <cos@apache.org>
Committed: Thu Feb 18 13:02:32 2016 +0300

----------------------------------------------------------------------
 .../puppet/modules/hawq/manifests/init.pp       | 15 ++++------
 .../puppet/modules/hawq/templates/hawq.default  | 30 ++++++++++++++++++++
 bigtop-deploy/puppet/modules/hawq/tests/init.pp |  2 +-
 3 files changed, 36 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bigtop/blob/5fa37edf/bigtop-deploy/puppet/modules/hawq/manifests/init.pp
----------------------------------------------------------------------
diff --git a/bigtop-deploy/puppet/modules/hawq/manifests/init.pp b/bigtop-deploy/puppet/modules/hawq/manifests/init.pp
index 6aef9de..ecd7926 100644
--- a/bigtop-deploy/puppet/modules/hawq/manifests/init.pp
+++ b/bigtop-deploy/puppet/modules/hawq/manifests/init.pp
@@ -16,20 +16,21 @@
 class hawq {
   class deploy ($roles) {
     if ("hawq" in $roles) {
-      ignite_hadoop::node { "hawq-node": }
+      hawq::cluster_node { "hawq-node": }
     }
   }
 
-  define node() {
+  define cluster_node() {
     $hadoop_head_node = hiera("bigtop::hadoop_head_node")
     $hadoop_namenode_port = hiera("hadoop::common_hdfs::hadoop_namenode_port", "8020")
 
     package { "hawq":
-      ensure => latest,
+      ensure  => latest,
+      ## require => for centos this crap needs epel-release
     }
 
     file { "/etc/default/hawq":
-      content => template("hawq/hawq"),
+      content => template("hawq/hawq.default"),
       require => Package["hawq"],
     }
 
@@ -56,12 +57,6 @@ class hawq {
         content => template('hawq/yarn-client.xml'),
         require => [File["/etc/hawq/conf"]],
     }
-## let's make sure that hawq libs are linked properly
-    file {'/usr/lib/hadoop/lib/hawq.jar':
-      ensure  => link,
-      target  => '/usr/lib/hawq/libs/hawq/hawq.jar',
-      require => [Package["hawq-service"]],
-    }
 
     service { "hawq":
       ensure  => running,

http://git-wip-us.apache.org/repos/asf/bigtop/blob/5fa37edf/bigtop-deploy/puppet/modules/hawq/templates/hawq.default
----------------------------------------------------------------------
diff --git a/bigtop-deploy/puppet/modules/hawq/templates/hawq.default b/bigtop-deploy/puppet/modules/hawq/templates/hawq.default
new file mode 100644
index 0000000..f8cf6e1
--- /dev/null
+++ b/bigtop-deploy/puppet/modules/hawq/templates/hawq.default
@@ -0,0 +1,30 @@
+# 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.
+
+export HAWQ_HOME="/usr/lib/hawq"
+export HAWQ_CONF_DIR="/etc/hawq/conf"
+
+export HAWQ_PID_DIR="/var/run/hawq"
+export HAWQ_LOG_DIR="/var/log/hawq"
+export HAWQ_WORK_DIR="/var/run/hawq/work"
+export HAWQ_IDENT_STRING=hawq
+
+export PATH=$HAWQ_HOME/bin:$HAWQ_HOME/ext/python/bin:$PATH
+export LD_LIBRARY_PATH=$HAWQ_HOME/lib:$HAWQ_HOME/ext/python/lib:$LD_LIBRARY_PATH
+export PYTHONPATH=$HAWQ_HOME/lib/python:$HAWQ_HOME/lib/python/pygresql:$PYTHONPATH
+export OPENSSL_CONF=$HAWQ_CONF_DIR/openssl.cnf
+export LIBHDFS3_CONF=$HAWQ_CONF_DIR/hdfs-client.xml
+export LIBYARN_CONF=$HAWQ_CONF_DIR/yarn-client.xml
+export HAWQSITE_CONF=$HAWQ_CONF_DIR/hawq-site.xml

http://git-wip-us.apache.org/repos/asf/bigtop/blob/5fa37edf/bigtop-deploy/puppet/modules/hawq/tests/init.pp
----------------------------------------------------------------------
diff --git a/bigtop-deploy/puppet/modules/hawq/tests/init.pp b/bigtop-deploy/puppet/modules/hawq/tests/init.pp
index 9f3840f..37a5a08 100644
--- a/bigtop-deploy/puppet/modules/hawq/tests/init.pp
+++ b/bigtop-deploy/puppet/modules/hawq/tests/init.pp
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-hawq::node { "test-hawq-node": }
+hawq::cluster_node { "test-hawq-node": }


Mime
View raw message