You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by co...@apache.org on 2016/03/17 19:37:54 UTC

[1/3] bigtop git commit: BIGTOP-2325. Deployment recipes for HAWQ

Repository: bigtop
Updated Branches:
  refs/heads/BIGTOP-2320 9de53a37f -> 3cee57abc


BIGTOP-2325. Deployment recipes for HAWQ

type in the template name


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

Branch: refs/heads/BIGTOP-2320
Commit: b2508fb002d7f87d88041e7af2504201b029996c
Parents: 9de53a3
Author: Cos <co...@apache.org>
Authored: Wed Mar 16 20:31:51 2016 -0500
Committer: Cos <co...@apache.org>
Committed: Wed Mar 16 21:44:39 2016 -0500

----------------------------------------------------------------------
 bigtop-deploy/puppet/modules/hawq/manifests/init.pp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bigtop/blob/b2508fb0/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 39ecb34..1c499ab 100644
--- a/bigtop-deploy/puppet/modules/hawq/manifests/init.pp
+++ b/bigtop-deploy/puppet/modules/hawq/manifests/init.pp
@@ -74,7 +74,7 @@ class hawq {
 
     file { "/etc/sysctl.conf":
 	# TODO overriding sysctl might be a somewhat dangerous, let's figure something better
-        content => template('hawq/ysysctl.conf'),
+        content => template('hawq/sysctl.conf'),
     }
     exec { "sysctl reset":
       path 	 => ['/usr/sbin'],
@@ -96,8 +96,13 @@ class hawq {
       ## but I don't think it matter, and for sure looks ugly
     }
 
+    package { "epel-release":
+      ensure 	 => latest,
+    }
+
     package { "python-pip":
       ensure 	 => latest,
+      require	 => [ Package['epel-release'] ],
     }
     package { "pychecker":
       ensure 	 => latest,


[2/3] bigtop git commit: BIGTOP-2325. Deployment recipes for HAWQ

Posted by co...@apache.org.
BIGTOP-2325. Deployment recipes for HAWQ

Getting rid of pycrypto install. It doesn't work anymore....


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

Branch: refs/heads/BIGTOP-2320
Commit: 94791dc8ceda738fe68c0d2d7c5d47519e83a53d
Parents: b2508fb
Author: Cos <co...@apache.org>
Authored: Wed Mar 16 21:45:11 2016 -0500
Committer: Cos <co...@apache.org>
Committed: Wed Mar 16 21:45:11 2016 -0500

----------------------------------------------------------------------
 bigtop-deploy/puppet/modules/hawq/manifests/init.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bigtop/blob/94791dc8/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 1c499ab..3d3d207 100644
--- a/bigtop-deploy/puppet/modules/hawq/manifests/init.pp
+++ b/bigtop-deploy/puppet/modules/hawq/manifests/init.pp
@@ -84,7 +84,7 @@ class hawq {
 
     exec { "install pygresql modules1":
       path 	 => ['/usr/bin'],
-      command	 => 'pip --retries=50 --timeout=300 install pg8000 simplejson unittest2 pycrypto pygresql pyyaml lockfile paramiko psi',
+      command	 => 'pip --retries=50 --timeout=300 install pg8000 simplejson unittest2 pygresql pyyaml lockfile paramiko psi',
       require	 => [ Package['python-pip', 'postgresql-devel'] ],
     }
     exec { "install pygresql modules2":
@@ -118,7 +118,7 @@ class hawq {
     exec { "hawk init master":
       path 	 => ['/usr/bin', '/usr/lib/hawq/bin/lib'],
       # Silly init will ask if I am really sure I want to init the cluster
-      command	 => 'bash -x run-init.sh master',
+      command	 => 'bash -x run-init.sh master $GPHOME',
       require	 => [ Package['hawq'], Exec ['sysctl reset', 'install pygresql modules2'] ],
     }
 


[3/3] bigtop git commit: BIGTOP-2321. Add packaging code for HAWQ

Posted by co...@apache.org.
BIGTOP-2321. Add packaging code for HAWQ

Adding thrift lib into the toolchain (as epel is getting installed anyway)


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

Branch: refs/heads/BIGTOP-2320
Commit: 3cee57abc9d2e9d697fc4832883b87d2d9e3d528
Parents: 94791dc
Author: Cos <co...@apache.org>
Authored: Thu Mar 17 13:37:07 2016 -0500
Committer: Cos <co...@apache.org>
Committed: Thu Mar 17 13:37:07 2016 -0500

----------------------------------------------------------------------
 bigtop_toolchain/manifests/packages.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bigtop/blob/3cee57ab/bigtop_toolchain/manifests/packages.pp
----------------------------------------------------------------------
diff --git a/bigtop_toolchain/manifests/packages.pp b/bigtop_toolchain/manifests/packages.pp
index 22c4ef3..1c63e1b 100644
--- a/bigtop_toolchain/manifests/packages.pp
+++ b/bigtop_toolchain/manifests/packages.pp
@@ -22,7 +22,7 @@ class bigtop_toolchain::packages {
        } else {
          $mysql_devel="mariadb-devel"
        }
-       $pkgs = [ "unzip", "curl", "libcurl-devel", "wget", "git", "make", "cmake", "autoconf", "automake", "libtool", "apr-devel", "bison", "gcc", "gcc-c++", "fuse", "createrepo", "lzo-devel", "bzip2-devel", "fuse-devel", "cppunit-devel", "gperf", "openssl-devel", "python-devel", "python-setuptools", "libxml2-devel", "libxslt-devel", "libuuid-devel", "libgsasl-devel", "libevent-devel", "json-c-devel", "cyrus-sasl-devel", "sqlite-devel", "openldap-devel", $mysql_devel, "rpm-build", "redhat-rpm-config", "fuse-libs", "asciidoc", "xmlto", "libyaml-devel", "gmp-devel", "readline-devel", "snappy-devel", "epel-release" ]
+       $pkgs = [ "unzip", "curl", "libcurl-devel", "wget", "git", "make", "cmake", "autoconf", "automake", "libtool", "apr-devel", "bison", "gcc", "gcc-c++", "fuse", "createrepo", "lzo-devel", "bzip2-devel", "fuse-devel", "cppunit-devel", "gperf", "openssl-devel", "python-devel", "python-setuptools", "libxml2-devel", "libxslt-devel", "libuuid-devel", "libgsasl-devel", "libevent-devel", "json-c-devel", "cyrus-sasl-devel", "sqlite-devel", "openldap-devel", $mysql_devel, "rpm-build", "redhat-rpm-config", "fuse-libs", "asciidoc", "xmlto", "libyaml-devel", "gmp-devel", "readline-devel", "snappy-devel", "epel-release", "thrift-devel" ]
      }
     /(?i:(SLES|opensuse))/: { $pkgs = [ "unzip", "curl", "libcurl-devel", "wget", "git", "make", "cmake", "autoconf", "automake", "libtool", "apr-devel", "bison", "gcc", "gcc-c++", "fuse", "createrepo", "lzo-devel", "bzip2-devel", "fuse-devel", "cppunit-devel", "gperf", "libopenssl-devel", "rpm-devel", "rpm-build", "pkg-config", "gmp-devel", "python-devel", "python-setuptools", "libxml2-devel", "libxslt-devel", "libuuid-devel", "libgsasl-devel", "libevent-devel", "json-c-devel", "cyrus-sasl-devel", "sqlite3-devel", "openldap2-devel", "libyaml-devel", "krb5-devel", "asciidoc", "xmlto", "libmysqlclient-devel", "readline-devel", "snappy-devel" ]
       # fix package dependencies: BIGTOP-2120 and BIGTOP-2152