ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject [01/15] AMBARI-5747 Remove facter-1.6.10, Ruby, Puppet dependencies from pom.xml and src (dsen)
Date Wed, 14 May 2014 14:02:09 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk d56db548d -> 3d1171b06


http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-server/src/main/java/org/apache/ambari/server/agent/ExecutionCommand.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/ExecutionCommand.java
b/ambari-server/src/main/java/org/apache/ambari/server/agent/ExecutionCommand.java
index e4b5fc5..882f1e3 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/agent/ExecutionCommand.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/ExecutionCommand.java
@@ -253,7 +253,6 @@ public class ExecutionCommand extends AgentCommand {
    */
   public static interface KeyNames {
 
-    String SCHEMA_VERSION = "schema_version";
     String COMMAND_TIMEOUT = "command_timeout";
     String SCRIPT = "script";
     String SCRIPT_TYPE = "script_type";

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatMonitor.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatMonitor.java
b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatMonitor.java
index 5eb7ead..2dddd20 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatMonitor.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatMonitor.java
@@ -250,7 +250,6 @@ public class HeartbeatMonitor implements Runnable {
 
     // Fill command params
     Map<String, String> commandParams = statusCmd.getCommandParams();
-    commandParams.put(SCHEMA_VERSION, serviceInfo.getSchemaVersion());
 
     String commandTimeout = configuration.getDefaultAgentTaskTimeout();
     CommandScriptDefinition script = componentInfo.getCommandScript();

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariActionExecutionHelper.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariActionExecutionHelper.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariActionExecutionHelper.java
index 0c7aa3e..bfcf3a8 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariActionExecutionHelper.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariActionExecutionHelper.java
@@ -51,7 +51,6 @@ import java.util.TreeMap;
 
 import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.COMMAND_TIMEOUT;
 import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.COMPONENT_CATEGORY;
-import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.SCHEMA_VERSION;
 import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.SCRIPT;
 import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.SCRIPT_TYPE;
 
@@ -316,7 +315,6 @@ public class AmbariActionExecutionHelper {
       commandParams.put(COMMAND_TIMEOUT, actionContext.getTimeout().toString());
       commandParams.put(SCRIPT, actionName + ".py");
       commandParams.put(SCRIPT_TYPE, TYPE_PYTHON);
-      commandParams.put(SCHEMA_VERSION, AmbariMetaInfo.SCHEMA_VERSION_2);
 
       ExecutionCommand execCmd = stage.getExecutionCommandWrapper(hostName,
         actionContext.getActionName()).getExecutionCommand();

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
index 8294895..b27698d 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
@@ -70,7 +70,6 @@ import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.COMPONENT
 import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.CUSTOM_COMMAND;
 import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.HOOKS_FOLDER;
 import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.REPO_INFO;
-import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.SCHEMA_VERSION;
 import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.SCRIPT;
 import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.SCRIPT_TYPE;
 import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.SERVICE_PACKAGE_FOLDER;
@@ -268,7 +267,6 @@ public class AmbariCustomCommandExecutionHelper {
       execCmd.setHostLevelParams(hostLevelParams);
 
       Map<String, String> commandParams = new TreeMap<String, String>();
-      commandParams.put(SCHEMA_VERSION, serviceInfo.getSchemaVersion());
       if (additionalCommandParams != null) {
         for (String key : additionalCommandParams.keySet()) {
           commandParams.put(key, additionalCommandParams.get(key));
@@ -443,7 +441,6 @@ public class AmbariCustomCommandExecutionHelper {
     execCmd.setHostLevelParams(hostLevelParams);
 
     Map<String, String> commandParams = new TreeMap<String, String>();
-    commandParams.put(SCHEMA_VERSION, serviceInfo.getSchemaVersion());
 
     String commandTimeout = configs.getDefaultAgentTaskTimeout();
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
index bdfd436..b2151f5 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
@@ -72,7 +72,6 @@ import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.MYSQL_JDB
 import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.ORACLE_JDBC_URL;
 import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.PACKAGE_LIST;
 import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.REPO_INFO;
-import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.SCHEMA_VERSION;
 import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.SCRIPT;
 import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.SCRIPT_TYPE;
 import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.SERVICE_PACKAGE_FOLDER;
@@ -1281,7 +1280,6 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
     if (commandParams == null) { // if not defined
       commandParams = new TreeMap<String, String>();
     }
-    commandParams.put(SCHEMA_VERSION, serviceInfo.getSchemaVersion());
     String commandTimeout = configs.getDefaultAgentTaskTimeout();
     /*
      * This script is only used for

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-server/src/main/java/org/apache/ambari/server/state/CommandScriptDefinition.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/CommandScriptDefinition.java
b/ambari-server/src/main/java/org/apache/ambari/server/state/CommandScriptDefinition.java
index 56e7438..e35619f 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/CommandScriptDefinition.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/CommandScriptDefinition.java
@@ -58,9 +58,7 @@ public class CommandScriptDefinition {
   }
 
   public static enum Type {
-    PYTHON,
-
-    PUPPET // TODO: Not supported yet. Do we really need it?
+    PYTHON
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-server/src/test/python/stacks/1.3.2/configs/default.hbasedecom.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/configs/default.hbasedecom.json b/ambari-server/src/test/python/stacks/1.3.2/configs/default.hbasedecom.json
index 674b37a..ce92689 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/configs/default.hbasedecom.json
+++ b/ambari-server/src/test/python/stacks/1.3.2/configs/default.hbasedecom.json
@@ -26,8 +26,7 @@
     "commandParams": {
         "command_timeout": "600", 
         "service_package_folder": "HDFS",
-        "script_type": "PYTHON", 
-        "schema_version": "2.0", 
+        "script_type": "PYTHON",
         "script": "scripts/datanode.py",
         "excluded_hosts": "host1,host2",
         "mark_draining_only" : "true",

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-server/src/test/python/stacks/1.3.2/configs/default.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/configs/default.json b/ambari-server/src/test/python/stacks/1.3.2/configs/default.json
index a5d38f6..8eabd30 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/configs/default.json
+++ b/ambari-server/src/test/python/stacks/1.3.2/configs/default.json
@@ -26,8 +26,7 @@
     "commandParams": {
         "command_timeout": "600", 
         "service_package_folder": "HDFS",
-        "script_type": "PYTHON", 
-        "schema_version": "2.0", 
+        "script_type": "PYTHON",
         "script": "scripts/datanode.py",
         "excluded_hosts": "host1,host2",
         "mark_draining_only" : "false",

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-server/src/test/python/stacks/1.3.2/configs/default.non_gmetad_host.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/configs/default.non_gmetad_host.json
b/ambari-server/src/test/python/stacks/1.3.2/configs/default.non_gmetad_host.json
index 43f7045..d9b928d 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/configs/default.non_gmetad_host.json
+++ b/ambari-server/src/test/python/stacks/1.3.2/configs/default.non_gmetad_host.json
@@ -26,8 +26,7 @@
     "commandParams": {
         "command_timeout": "600", 
         "service_package_folder": "HDFS",
-        "script_type": "PYTHON", 
-        "schema_version": "2.0", 
+        "script_type": "PYTHON",
         "script": "scripts/datanode.py",
         "excluded_hosts": "host1,host2",
         "mark_draining_only" : "false",

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-server/src/test/python/stacks/1.3.2/configs/secured.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/configs/secured.json b/ambari-server/src/test/python/stacks/1.3.2/configs/secured.json
index c4a8498..fe3d6f6 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/configs/secured.json
+++ b/ambari-server/src/test/python/stacks/1.3.2/configs/secured.json
@@ -26,8 +26,7 @@
     "commandParams": {
         "command_timeout": "600", 
         "service_package_folder": "HIVE",
-        "script_type": "PYTHON", 
-        "schema_version": "2.0", 
+        "script_type": "PYTHON",
         "script": "scripts/mysql_server.py",
         "excluded_hosts": "host1",
         "mark_draining_only" : "false",

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-server/src/test/python/stacks/1.3.2/configs/secured_no_jce_name.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/configs/secured_no_jce_name.json b/ambari-server/src/test/python/stacks/1.3.2/configs/secured_no_jce_name.json
index 04ca9ce..105d0b7 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/configs/secured_no_jce_name.json
+++ b/ambari-server/src/test/python/stacks/1.3.2/configs/secured_no_jce_name.json
@@ -25,8 +25,7 @@
     "commandParams": {
         "command_timeout": "600", 
         "service_package_folder": "HIVE",
-        "script_type": "PYTHON", 
-        "schema_version": "2.0", 
+        "script_type": "PYTHON",
         "script": "scripts/mysql_server.py",
         "excluded_hosts": "host1",
         "mark_draining_only" : "false",

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-server/src/test/python/stacks/2.0.6/configs/default.hbasedecom.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default.hbasedecom.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default.hbasedecom.json
index c45918d..4817a58 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/default.hbasedecom.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default.hbasedecom.json
@@ -22,8 +22,7 @@
     "commandParams": {
         "command_timeout": "300", 
         "service_package_folder": "OOZIE",
-        "script_type": "PYTHON", 
-        "schema_version": "2.0", 
+        "script_type": "PYTHON",
         "script": "scripts/service_check.py",
         "excluded_hosts": "host1",
         "mark_draining_only": "true"

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
index efbafa5..3f5220e 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
@@ -22,8 +22,7 @@
     "commandParams": {
         "command_timeout": "300", 
         "service_package_folder": "OOZIE",
-        "script_type": "PYTHON", 
-        "schema_version": "2.0", 
+        "script_type": "PYTHON",
         "script": "scripts/service_check.py",
         "excluded_hosts": "host1,host2",
         "mark_draining_only" : "false"

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-server/src/test/python/stacks/2.0.6/configs/default.non_gmetad_host.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default.non_gmetad_host.json
b/ambari-server/src/test/python/stacks/2.0.6/configs/default.non_gmetad_host.json
index 0a5ccae..b30714c 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/default.non_gmetad_host.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default.non_gmetad_host.json
@@ -22,8 +22,7 @@
     "commandParams": {
         "command_timeout": "300", 
         "service_package_folder": "OOZIE",
-        "script_type": "PYTHON", 
-        "schema_version": "2.0", 
+        "script_type": "PYTHON",
         "script": "scripts/service_check.py",
         "excluded_hosts": "host1,host2",
         "mark_draining_only" : "false"

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-server/src/test/python/stacks/2.0.6/configs/flume_target.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/flume_target.json b/ambari-server/src/test/python/stacks/2.0.6/configs/flume_target.json
index cb81436..931f202 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/flume_target.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/flume_target.json
@@ -22,8 +22,7 @@
     "commandParams": {
         "command_timeout": "300", 
         "service_package_folder": "OOZIE",
-        "script_type": "PYTHON", 
-        "schema_version": "2.0", 
+        "script_type": "PYTHON",
         "script": "scripts/service_check.py",
         "excluded_hosts": "host1,host2",
         "mark_draining_only" : "false",

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-server/src/test/python/stacks/2.0.6/configs/ha_default.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/ha_default.json b/ambari-server/src/test/python/stacks/2.0.6/configs/ha_default.json
index f152ed7..0ea0db3 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/ha_default.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/ha_default.json
@@ -27,8 +27,7 @@
     "commandParams": {
         "service_package_folder": "HDP/2.0.6/services/YARN/package", 
         "script": "scripts/nodemanager.py", 
-        "hooks_folder": "HDP/2.0.6/hooks", 
-        "schema_version": "2.0", 
+        "hooks_folder": "HDP/2.0.6/hooks",
         "command_timeout": "600", 
         "script_type": "PYTHON"
     }, 

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-server/src/test/python/stacks/2.0.6/configs/ha_secured.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/ha_secured.json b/ambari-server/src/test/python/stacks/2.0.6/configs/ha_secured.json
index 6f60980..dce20fa 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/ha_secured.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/ha_secured.json
@@ -27,8 +27,7 @@
     "commandParams": {
         "service_package_folder": "HDP/2.0.6/services/HDFS/package", 
         "script": "scripts/zkfc_slave.py", 
-        "hooks_folder": "HDP/2.0.6/hooks", 
-        "schema_version": "2.0", 
+        "hooks_folder": "HDP/2.0.6/hooks",
         "command_timeout": "600", 
         "script_type": "PYTHON"
     }, 

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json b/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json
index b3e77fd..12de853 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json
@@ -26,8 +26,7 @@
     "commandParams": {
         "command_timeout": "600", 
         "service_package_folder": "YARN",
-        "script_type": "PYTHON", 
-        "schema_version": "2.0", 
+        "script_type": "PYTHON",
         "script": "scripts/yarn_client.py",
         "excluded_hosts": "host1",
         "mark_draining_only" : "false"

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-server/src/test/python/stacks/2.0.6/configs/secured_no_jce_name.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/secured_no_jce_name.json b/ambari-server/src/test/python/stacks/2.0.6/configs/secured_no_jce_name.json
index f403cde..ecf5031 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/secured_no_jce_name.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/secured_no_jce_name.json
@@ -25,8 +25,7 @@
     "commandParams": {
         "command_timeout": "600", 
         "service_package_folder": "YARN",
-        "script_type": "PYTHON", 
-        "schema_version": "2.0", 
+        "script_type": "PYTHON",
         "script": "scripts/yarn_client.py",
         "excluded_hosts": "host1",
         "mark_draining_only" : "false"

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-server/src/test/python/stacks/2.1/configs/default.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.1/configs/default.json b/ambari-server/src/test/python/stacks/2.1/configs/default.json
index d80c28d..82e1013 100644
--- a/ambari-server/src/test/python/stacks/2.1/configs/default.json
+++ b/ambari-server/src/test/python/stacks/2.1/configs/default.json
@@ -22,8 +22,7 @@
     "commandParams": {
         "command_timeout": "300", 
         "service_package_folder": "OOZIE",
-        "script_type": "PYTHON", 
-        "schema_version": "2.0", 
+        "script_type": "PYTHON",
         "script": "scripts/service_check.py",
         "excluded_hosts": "host1,host2"
     },

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-server/src/test/python/stacks/2.1/configs/secured.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.1/configs/secured.json b/ambari-server/src/test/python/stacks/2.1/configs/secured.json
index 68b04d0..774cd2f 100644
--- a/ambari-server/src/test/python/stacks/2.1/configs/secured.json
+++ b/ambari-server/src/test/python/stacks/2.1/configs/secured.json
@@ -27,8 +27,7 @@
     "commandParams": {
         "command_timeout": "600", 
         "service_package_folder": "YARN",
-        "script_type": "PYTHON", 
-        "schema_version": "2.0", 
+        "script_type": "PYTHON",
         "script": "scripts/yarn_client.py",
         "excluded_hosts": "host1"
     }, 

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/docs/src/site/apt/install-0.9.apt
----------------------------------------------------------------------
diff --git a/docs/src/site/apt/install-0.9.apt b/docs/src/site/apt/install-0.9.apt
index d11878e..25c14e0 100644
--- a/docs/src/site/apt/install-0.9.apt
+++ b/docs/src/site/apt/install-0.9.apt
@@ -62,7 +62,7 @@ Installing Ambari
   2) Install ambari-agent on each of the cluster nodes.
 
     * To install ambari-agent, point to the freely accessible HDP repo
-that contains the required dependencies (e.g., Puppet).  Then use yum to install ambari-agent
RPM and all of its dependencies.
+that contains the required dependencies.  Then use yum to install ambari-agent RPM and all
of its dependencies.
 
     On RHEL/CentOS 5:
 
@@ -90,7 +90,7 @@ $ sudo service iptables stop
 
   4) Install Ambari server on Ambari master:
 
-    * To install Ambari server, point to the freely accessible HDP repo that contains the
required dependencies (e.g., Puppet, PHP, Ruby, etc).  Then use yum to install Ambari RPMs
and all of the dependencies.
+    * To install Ambari server, point to the freely accessible HDP repo that contains the
required dependencies (e.g., PHP, etc).  Then use yum to install Ambari RPMs and all of the
dependencies.
 
     On RHEL/CentOS 5:
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/docs/src/site/apt/install.apt
----------------------------------------------------------------------
diff --git a/docs/src/site/apt/install.apt b/docs/src/site/apt/install.apt
index b48bb2b..e33c873 100644
--- a/docs/src/site/apt/install.apt
+++ b/docs/src/site/apt/install.apt
@@ -62,7 +62,7 @@ Installing Ambari
   2) Install ambari-agent on each of the cluster nodes.
 
     * To install ambari-agent, point to the freely accessible HDP repo
-that contains the required dependencies (e.g., Puppet).  Then use yum to install ambari-agent
RPM and all of its dependencies.
+that contains the required dependencies.  Then use yum to install ambari-agent RPM and all
of its dependencies.
 
     On RHEL/CentOS 5:
 
@@ -90,7 +90,7 @@ $ sudo service iptables stop
 
   4) Install Ambari server on Ambari master:
 
-    * To install Ambari server, point to the freely accessible HDP repo that contains the
required dependencies (e.g., Puppet, PHP, Ruby, etc).  Then use yum to install Ambari RPMs
and all of the dependencies.
+    * To install Ambari server, point to the freely accessible HDP repo that contains the
required dependencies (e.g., PHP, etc).  Then use yum to install Ambari RPMs and all of the
dependencies.
 
     On RHEL/CentOS 5:
 


Mime
View raw message