AMBARI-326. Dependencies should be added only during install phase (Contributed by Jitendra)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/branches/ambari-186@1345407 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -6,6 +6,8 @@ characters wide.
 
 Release 0.1.x - unreleased
 
+  AMBARI-326. Dependencies should be added only during install phase (Jitendra via Vikram)
+
   AMBARI-324. Welcome page missing. (Yusaku via Vikram)
 
   AMBARI-323. During any process in the cluster initialization wizard, if the user goes back to the "1 Create Cluster" tab, the user is stuck. (Vikram)

hmc/php/puppet/genmanifest/PuppetClassDependencies.php

@@ -41,9 +41,9 @@ class PuppetClassDependencies {
         array("service_state" => SERVICE_STATE_INSTALLED_AND_CONFIGURED));
 
     $this->addDependency("hdp-hbase::master", SERVICE_STATE_RUNNING, "hdp-zookeeper::client",
-        array("service_state" => SERVICE_STATE_INSTALLED_AND_CONFIGURED));
+        array("service_state" => SERVICE_STATE_NO_OP));
     $this->addDependency("hdp-hbase::master", SERVICE_STATE_RUNNING, "hdp-hadoop::client",
-        array("service_state" => SERVICE_STATE_INSTALLED_AND_CONFIGURED));
+        array("service_state" => SERVICE_STATE_NO_OP));
 
     $this->addDependency("hdp-hbase::regionserver", SERVICE_STATE_INSTALLED_AND_CONFIGURED, "hdp-zookeeper::client",
         array("service_state" => SERVICE_STATE_INSTALLED_AND_CONFIGURED));
@@ -51,21 +51,21 @@ class PuppetClassDependencies {
         array("service_state" => SERVICE_STATE_INSTALLED_AND_CONFIGURED));
 
     $this->addDependency("hdp-hbase::regionserver", SERVICE_STATE_RUNNING, "hdp-zookeeper::client",
-        array("service_state" => SERVICE_STATE_INSTALLED_AND_CONFIGURED));
+        array("service_state" => SERVICE_STATE_NO_OP));
     $this->addDependency("hdp-hbase::regionserver", SERVICE_STATE_RUNNING, "hdp-hadoop::client",
-        array("service_state" => SERVICE_STATE_INSTALLED_AND_CONFIGURED));
+        array("service_state" => SERVICE_STATE_NO_OP));
 
     //Oozie
     $this->addDependency("hdp-oozie::server", SERVICE_STATE_INSTALLED_AND_CONFIGURED, "hdp-hadoop::client",
         array("service_state" => SERVICE_STATE_INSTALLED_AND_CONFIGURED));
     $this->addDependency("hdp-oozie::server", SERVICE_STATE_RUNNING, "hdp-hadoop::client",
-        array("service_state" => SERVICE_STATE_INSTALLED_AND_CONFIGURED));
+        array("service_state" => SERVICE_STATE_NO_OP));
 
     //Hive depends on Hcat
     $this->addDependency("hdp-hive::server", SERVICE_STATE_INSTALLED_AND_CONFIGURED, "hdp-hcat",
         array("service_state" => SERVICE_STATE_INSTALLED_AND_CONFIGURED));
     $this->addDependency("hdp-hive::server", SERVICE_STATE_RUNNING, "hdp-hcat",
-        array("service_state" => SERVICE_STATE_INSTALLED_AND_CONFIGURED));
+        array("service_state" => SERVICE_STATE_NO_OP));
     $this->addDependency("hdp-hive::client", SERVICE_STATE_INSTALLED_AND_CONFIGURED, "hdp-hcat",
         array("service_state" => SERVICE_STATE_INSTALLED_AND_CONFIGURED));
 
@@ -92,13 +92,13 @@ class PuppetClassDependencies {
         array("service_state" => SERVICE_STATE_INSTALLED_AND_CONFIGURED));
 
     $this->addDependency("hdp-templeton::server", SERVICE_STATE_RUNNING, "hdp-zookeeper::client",
-        array("service_state" => SERVICE_STATE_INSTALLED_AND_CONFIGURED));
+        array("service_state" => SERVICE_STATE_NO_OP));
     $this->addDependency("hdp-templeton::server", SERVICE_STATE_RUNNING, "hdp-hadoop::client",
-        array("service_state" => SERVICE_STATE_INSTALLED_AND_CONFIGURED));
+        array("service_state" => SERVICE_STATE_NO_OP));
     $this->addDependency("hdp-templeton::server", SERVICE_STATE_RUNNING, "hdp-pig",
-        array("service_state" => SERVICE_STATE_INSTALLED_AND_CONFIGURED));
+        array("service_state" => SERVICE_STATE_NO_OP));
     $this->addDependency("hdp-templeton::server", SERVICE_STATE_RUNNING, "hdp-hcat",
-        array("service_state" => SERVICE_STATE_INSTALLED_AND_CONFIGURED));
+        array("service_state" => SERVICE_STATE_NO_OP));
 
     //Ganglia
     $this->addDependency("hdp-ganglia::monitor", SERVICE_STATE_RUNNING, "hdp-ganglia::hdp-gmond::service_check", array());