incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From maha...@apache.org
Subject git commit: Revert "AMBARI-3195. WebHCat install and start fails when adding service after initial cluster install. (Vladimir Tkhir via swagle)"
Date Fri, 13 Sep 2013 22:24:54 GMT
Updated Branches:
  refs/heads/trunk 99d9d038d -> 534f78953


Revert "AMBARI-3195. WebHCat install and start fails when adding service after initial cluster
install. (Vladimir Tkhir via swagle)"

This reverts commit 7a32144ed504f1824df346f95333fb6a84f74a29.


Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/534f7895
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/534f7895
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/534f7895

Branch: refs/heads/trunk
Commit: 534f78953da1c625be8cf7f2acf5f0346ed99a84
Parents: 99d9d03
Author: Mahadev Konar <mahadev@apache.org>
Authored: Fri Sep 13 15:23:37 2013 -0700
Committer: Mahadev Konar <mahadev@apache.org>
Committed: Fri Sep 13 15:23:37 2013 -0700

----------------------------------------------------------------------
 .../main/puppet/modules/hdp-templeton/manifests/server.pp | 10 +---------
 .../puppet/modules/hdp-templeton/manifests/service.pp     |  2 +-
 2 files changed, 2 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/534f7895/ambari-agent/src/main/puppet/modules/hdp-templeton/manifests/server.pp
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-templeton/manifests/server.pp b/ambari-agent/src/main/puppet/modules/hdp-templeton/manifests/server.pp
index 2fd3506..73a25cc 100644
--- a/ambari-agent/src/main/puppet/modules/hdp-templeton/manifests/server.pp
+++ b/ambari-agent/src/main/puppet/modules/hdp-templeton/manifests/server.pp
@@ -58,14 +58,6 @@ class hdp-templeton::server(
     service_state => $service_state,
     server        => true
   }
-  
-  hdp-hadoop::namenode::create_app_directories { 'create_app_directories' :
-      service_state => $service_state
-  }
-
-  hdp-hadoop::namenode::create_user_directories { 'create_user_directories' :
-    service_state => $service_state
-  }
 
   class { 'hdp-templeton::copy-hdfs-directories' :
     service_state => $service_state
@@ -76,7 +68,7 @@ class hdp-templeton::server(
   }
   
   #top level does not need anchors
-  Class['hdp-templeton'] -> Hdp-Hadoop::Namenode::Create_app_directories['create_app_directories']
-> Hdp-Hadoop::Namenode::Create_user_directories['create_user_directories'] -> Class['hdp-templeton::copy-hdfs-directories']
-> Class['hdp-templeton::service']
+  Class['hdp-templeton'] -> Class['hdp-templeton::copy-hdfs-directories'] -> Class['hdp-templeton::service']
   } else { 
   hdp_fail("TODO not implemented yet: service_state = ${service_state}")
   }

http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/534f7895/ambari-agent/src/main/puppet/modules/hdp-templeton/manifests/service.pp
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-templeton/manifests/service.pp b/ambari-agent/src/main/puppet/modules/hdp-templeton/manifests/service.pp
index 1489599..ceb3db0 100644
--- a/ambari-agent/src/main/puppet/modules/hdp-templeton/manifests/service.pp
+++ b/ambari-agent/src/main/puppet/modules/hdp-templeton/manifests/service.pp
@@ -41,7 +41,7 @@ class hdp-templeton::service(
   }
 
   hdp-templeton::service::directory { $hdp-templeton::params::templeton_pid_dir : }
-  hdp-templeton::service::directory { $hdp-templeton::params::templeton_log_dir : }
+  hdp-templeton::service::directory { $hdp-templeton::params::hcat_log_dir : }
 
   anchor{'hdp-templeton::service::begin':} -> Hdp-templeton::Service::Directory<||>
-> anchor{'hdp-templeton::service::end':}
   


Mime
View raw message