BIGTOP-1828. Puppet: Tachyon does not formatted before tachyon daemons are started up

2 files changed, 4 insertions, 4 deletions

diff --git a/bigtop-deploy/puppet/modules/tachyon/manifests/init.pp b/bigtop-deploy/puppet/modules/tachyon/manifests/init.pp
index e9715ae3..557b05ef 100644
--- a/bigtop-deploy/puppet/modules/tachyon/manifests/init.pp
+++ b/bigtop-deploy/puppet/modules/tachyon/manifests/init.pp
@@ -35,13 +35,13 @@ class tachyon {
    exec {
         "tachyon formatting":
            command => "/usr/lib/tachyon/bin/tachyon format",
-           require => [ Package["tachyon"]]
+           require => [ Package["tachyon"], File["/etc/tachyon/conf/log4j.properties"], File["/etc/tachyon/conf/tachyon-env.sh"] ]
     }
 
     if ( $fqdn == $tachyon::common::master_host ) {
       service { "tachyon-master":
         ensure => running,
-        require => [ Package["tachyon"] ],
+        require => [ Package["tachyon"], Exec["tachyon formatting"] ],
         hasrestart => true,
         hasstatus => true,
       }
@@ -60,7 +60,7 @@ class tachyon {
 
     service { "tachyon-worker":
       ensure => running,
-      require => [Package["tachyon"]],
+      require => [ Package["tachyon"], File["/etc/tachyon/conf/log4j.properties"], File["/etc/tachyon/conf/tachyon-env.sh"] ],
       hasrestart => true,
       hasstatus => true,
     }
diff --git a/bigtop-deploy/puppet/modules/tachyon/templates/tachyon-env.sh b/bigtop-deploy/puppet/modules/tachyon/templates/tachyon-env.sh
index 10949763..9e7dbc26 100755
--- a/bigtop-deploy/puppet/modules/tachyon/templates/tachyon-env.sh
+++ b/bigtop-deploy/puppet/modules/tachyon/templates/tachyon-env.sh
@@ -31,7 +31,7 @@ export JAVA="$JAVA_HOME/bin/java"
 
 echo "Starting tachyon w/ java = $JAVA "
 
-export TACHYON_MASTER_ADDRESS=<%= @tachyon_master_address %>
+export TACHYON_MASTER_ADDRESS=<%= @master_host %>
 export TACHYON_UNDERFS_ADDRESS=$TACHYON_HOME/underfs
 #export TACHYON_UNDERFS_ADDRESS=hdfs://localhost:9000
 export TACHYON_WORKER_MEMORY_SIZE=1GB