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. The deployment test is pretty much working now.
Date Thu, 18 Feb 2016 17:36:20 GMT
Repository: bigtop
Updated Branches:
  refs/heads/BIGTOP-2320 6ac64fd9c -> 8161fc9e9


BIGTOP-2325. The deployment test is pretty much working now.


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

Branch: refs/heads/BIGTOP-2320
Commit: 8161fc9e972b5a32aa3324ac6329bad3df29a2b9
Parents: 6ac64fd
Author: Konstantin Boudnik <cos@apache.org>
Authored: Thu Feb 18 20:35:55 2016 +0300
Committer: Konstantin Boudnik <cos@apache.org>
Committed: Thu Feb 18 20:35:55 2016 +0300

----------------------------------------------------------------------
 .../puppet/modules/hawq/manifests/init.pp        | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bigtop/blob/8161fc9e/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 a8da991..1027a6b 100644
--- a/bigtop-deploy/puppet/modules/hawq/manifests/init.pp
+++ b/bigtop-deploy/puppet/modules/hawq/manifests/init.pp
@@ -14,8 +14,6 @@
 # limitations under the License.
 
 class hawq {
-  include stdlib
-
   class deploy ($roles) {
     if ("hawq" in $roles) {
       hawq::cluster_node { "hawq-node": }
@@ -42,8 +40,8 @@ class hawq {
 
     file { "/etc/hawq/conf":
       ensure  => directory,
-      owner   => 'root',
-      group   => 'root',
+      owner   => 'hawq',
+      group   => 'hawq',
       mode    => '0755',
       require => Package["hawq"],
     }
@@ -65,9 +63,8 @@ class hawq {
     }
     file { "/etc/hawq/conf/slaves":
         ensure  => file,
-        content => $slaves_content,
+        content => "localhost", ## TODO - this has to be dynamic
     }
-    $slaves_content = join (hiera('bigtop::hawq_slaves), ' ')
 
     exec { "install pygresql modules1":
       path 	 => ['/usr/bin'],
@@ -95,6 +92,7 @@ class hawq {
       ensure 	 => latest,
     }
 
+### TODO init require hdfs to be running. Need to test this
     exec { "hawk init":
       path 	 => ['/usr/bin'],
       # Silly init will ask if I am really sure I want to init the cluster
@@ -102,10 +100,11 @@ class hawq {
       require	 => [ Package['hawq', 'python-pip', 'postgresql'], Exec ['install pygresql
modules3'] ],
     }
 
-    service { "hawq":
-      ensure  => running,
-      require => [ Package["hawq"], File["/etc/default/hawq"], Exec["hawk init"] ],
-      subscribe => [ Package["hawq"], File["/etc/default/hawq", "/etc/hawq/conf/hawq-site.xml"]
]
+### TODO The expectation is that init will start the service. I don't think so...
+#    service { "hawq":
+#      ensure  => running,
+#      require => [ Package["hawq"], File["/etc/default/hawq"], Exec["hawk init"] ],
+#     subscribe => [ Package["hawq"], File["/etc/default/hawq", "/etc/hawq/conf/hawq-site.xml"]
]
     }
   }
 }


Mime
View raw message