http://git-wip-us.apache.org/repos/asf/ambari/blob/1e5a47e9/ambari-server/src/test/python/stacks/2.1/configs/default-storm-start.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/configs/default-storm-start.json b/ambari-server/src/test/python/stacks/2.1/configs/default-storm-start.json index 05330a0..8eb3c6c 100644 --- a/ambari-server/src/test/python/stacks/2.1/configs/default-storm-start.json +++ b/ambari-server/src/test/python/stacks/2.1/configs/default-storm-start.json @@ -12,8 +12,156 @@ "ZOOKEEPER_CLIENT", "NAMENODE" ], - - "configuration_attributes": { + "clusterLevelParams": { + "stack_version": "2.2", + "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]", + "hooks_folder": "stack-hooks", + "stack_name": "HDP", + "group_list": "[\"hdfs\",\"hadoop\",\"users\"]", + "user_groups": "{\"hive\":[\"hadoop\"], \"oozie\":[\"hadoop\",\"users\"], \"nobody\":[\"hadoop\",\"nobody\"], \"ambari-qa\":[\"hadoop\",\"users\"], \"flume\":[\"hadoop\"], \"hdfs\":[\"hadoop\"], \"storm\":[\"hadoop\"], \"mapred\":[\"hadoop\"], \"hbase\":[\"hadoop\"], \"tez\":[\"hadoop\",\"users\"], \"zookeeper\":[\"hadoop\"], \"falcon\":[\"hadoop\",\"users\"], \"sqoop\":[\"hadoop\"], \"yarn\":[\"hadoop\"], \"hcat\":[\"hadoop\"]}", + "cluster_name": "c1", + "user_list": "[\"ambari-qa\",\"hdfs\"]" + }, + "ambariLevelParams": { + "jdk_location": "http://c6401.ambari.apache.org:8080/resources/";, + "agent_stack_retry_count": "5", + "db_driver_filename": "mysql-connector-java.jar", + "agent_stack_retry_on_unavailability": "false", + "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca", + "jce_name": "jce_policy-7.zip", + "java_version": "7", + "ambari_db_rca_password": "mapred", + "host_sys_prepped": "false", + "db_name": "ambari", + "oracle_jdbc_url": "http://c6401.ambari.apache.org/resources//ojdbc6.jar";, + "ambari_db_rca_driver": "org.postgresql.Driver", + "ambari_db_rca_username": "mapred", + "jdk_name": "jdk-7u45-linux-x64.tar.gz", + "java_home": "/usr/jdk64/jdk1.7.0_45", + "mysql_jdbc_url": "http://c6401.ambari.apache.org/resources//mysql-connector-java.jar"; + }, + "repositoryFile": { + "resolved": true, + "repoVersion": "2.6.4.0-60", + "repositories": [ + { + "mirrorsList": null, + "ambariManaged": true, + "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.6.4.0-60";, + "repoName": "HDP", + "components": null, + "osType": "redhat6", + "distribution": null, + "repoId": "HDP-2.6-repo-1" + }, + { + "mirrorsList": null, + "ambariManaged": true, + "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP-GPL/centos6/2.x/BUILDS/2.6.4.0-60";, + "repoName": "HDP-GPL", + "components": null, + "osType": "redhat6", + "distribution": null, + "repoId": "HDP-2.6-GPL-repo-1" + }, + { + "mirrorsList": null, + "ambariManaged": true, + "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.22/repos/centos6";, + "repoName": "HDP-UTILS", + "components": null, + "osType": "redhat6", + "distribution": null, + "repoId": "HDP-UTILS-1.1.0.22-repo-1" + } + ], + "feature": { + "m_isScoped": true, + "m_isPreInstalled": false + }, + "stackName": "HDP", + "repoVersionId": 1 + }, + "agentLevelParams": { + "public_hostname": null, + "hostname": "c6401.ambari.apache.org", + "agentConfigParams": { + "agent": { + "parallel_execution": 0, + "use_system_proxy_settings": true + } + }, + "agentCacheDir": "/var/lib/ambari-agent/cache" + }, + "hostLevelParams": { + "recoveryConfig": { + "retryGap": "5", + "windowInMinutes": "60", + "maxLifetimeCount": "1024", + "components": "", + "maxCount": "6", + "type": "AUTO_START" + }, + "hostRepositories": { + "componentRepos": { + "NAMENODE": 1, + "SECONDARY_NAMENODE": 1, + "DATANODE": 1, + "HDFS_CLIENT": 1 + }, + "commandRepos": { + "1": { + "resolved": true, + "repoVersion": "2.1.4.0-60", + "repositories": [ + { + "mirrorsList": null, + "ambariManaged": true, + "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.6.4.0-60";, + "repoName": "HDP", + "components": null, + "osType": "redhat6", + "distribution": null, + "repoId": "HDP-2.6-repo-1" + }, + { + "mirrorsList": null, + "ambariManaged": true, + "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP-GPL/centos6/2.x/BUILDS/2.6.4.0-60";, + "repoName": "HDP-GPL", + "components": null, + "osType": "redhat6", + "distribution": null, + "repoId": "HDP-2.6-GPL-repo-1" + }, + { + "mirrorsList": null, + "ambariManaged": true, + "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.22/repos/centos6";, + "repoName": "HDP-UTILS", + "components": null, + "osType": "redhat6", + "distribution": null, + "repoId": "HDP-UTILS-1.1.0.22-repo-1" + } + ], + "feature": { + "m_isScoped": true, + "m_isPreInstalled": false + }, + "stackName": "HDP", + "repoVersionId": 1 + } + } + } + }, + "serviceLevelParams": { + "credentialStoreEnabled": false, + "status_commands_timeout": 300, + "version": "2.7.3", + "service_package_folder": "common-services/HDFS/2.1.0.2.0/package" + }, + "configurationAttributes": { "storm-site": {}, "hdfs-site": { "final": { @@ -403,7 +551,7 @@ "ambari_server_host": [ "c6401.ambari.apache.org" ], - "zookeeper_hosts": [ + "zookeeper_server_hosts": [ "c6402.ambari.apache.org" ], "supervisor_hosts": [
http://git-wip-us.apache.org/repos/asf/ambari/blob/1e5a47e9/ambari-server/src/test/python/stacks/2.1/configs/hive-metastore-upgrade.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/configs/hive-metastore-upgrade.json b/ambari-server/src/test/python/stacks/2.1/configs/hive-metastore-upgrade.json index 3bf8b6d..aad3ca7 100644 --- a/ambari-server/src/test/python/stacks/2.1/configs/hive-metastore-upgrade.json +++ b/ambari-server/src/test/python/stacks/2.1/configs/hive-metastore-upgrade.json @@ -3,7 +3,7 @@ "forceRefreshConfigTagsBeforeExecution": [ "*" ], - "configuration_attributes": { + "configurationAttributes": { }, "commandParams": { "upgrade_direction": "upgrade", @@ -22,32 +22,163 @@ "kerberosCommandParams": [], "clusterName": "c1", "hostname": "c6402.ambari.apache.org", - "hostLevelParams": { + "commandParams": { + "service_package_folder": "common-services/HDFS/2.1.0.2.0/package", + "script": "scripts/service_check.py", + "hooks_folder": "stack-hooks", + "version": "2.1.0.0-1234", + "command_timeout": "300", + "script_type": "PYTHON" + }, + "clusterLevelParams": { + "stack_version": "2.1", "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]", - "agent_stack_retry_count": "5", - "agent_stack_retry_on_unavailability": "false", + "hooks_folder": "stack-hooks", "stack_name": "HDP", - "group_list": "[\"hadoop\",\"users\"]", - "host_sys_prepped": "false", - "ambari_db_rca_username": "mapred", - "jdk_name": "jdk-7u45-linux-x64.tar.gz", - "mysql_jdbc_url": "http://10.0.0.13:8080/resources//mysql-connector-java.jar";, - "repo_info": "[{\"baseUrl\":\"http://repos.ambari.apache.org/hdp/HDP-2.3.0.0-2557\",\"osType\":\"redhat6\",\"repoId\":\"HDP-2.3\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.3.0.0\",\"latestBaseUrl\":\"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.3.4.0-3360\",\"baseSaved\":true},{\"baseUrl\":\"http://repos.ambari.apache.org/hdp/HDP-UTILS-1.1.0.20\",\"osType\":\"redhat6\",\"repoId\":\"HDP-UTILS-1.1.0.20\",\"repoName\":\"HDP-UTILS\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.20/repos/centos6\",\"latestBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.20/repos/centos6\",\"baseSaved\":true}]";, - "custom_command": "RESTART", - "stack_version": "2.3", - "ambari_db_rca_driver": "org.postgresql.Driver", - "java_home": "/usr/jdk64/jdk1.7.0_45", - "jdk_location": "http://10.0.0.13:8080/resources/";, - "ambari_db_rca_url": "jdbc:postgresql://10.0.0.13/ambarirca", + "group_list": "[\"hdfs\",\"hadoop\",\"users\"]", + "user_groups": "{\"hive\":[\"hadoop\"], \"oozie\":[\"hadoop\",\"users\"], \"nobody\":[\"hadoop\",\"nobody\"], \"ambari-qa\":[\"hadoop\",\"users\"], \"flume\":[\"hadoop\"], \"hdfs\":[\"hadoop\"], \"storm\":[\"hadoop\"], \"mapred\":[\"hadoop\"], \"hbase\":[\"hadoop\"], \"tez\":[\"hadoop\",\"users\"], \"zookeeper\":[\"hadoop\"], \"falcon\":[\"hadoop\",\"users\"], \"sqoop\":[\"hadoop\"], \"yarn\":[\"hadoop\"], \"hcat\":[\"hadoop\"]}", + "cluster_name": "c1", + "user_list": "[\"ambari-qa\",\"hdfs\"]" + }, + "ambariLevelParams": { + "jdk_location": "http://c6401.ambari.apache.org:8080/resources/";, + "agent_stack_retry_count": "5", + "db_driver_filename": "mysql-connector-java.jar", + "agent_stack_retry_on_unavailability": "false", + "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca", + "jce_name": "jce_policy-7.zip", "java_version": "7", - "oracle_jdbc_url": "http://10.0.0.13:8080/resources//ojdbc6.jar";, - "agentCacheDir": "/var/lib/ambari-agent/cache", "ambari_db_rca_password": "mapred", - "jce_name": "UnlimitedJCEPolicyJDK7.zip", + "host_sys_prepped": "false", "db_name": "ambari", - "db_driver_filename": "mysql-connector-java.jar", - "user_list": "[\"hive\",\"mapred\",\"ambari-qa\",\"zookeeper\",\"tez\",\"hdfs\",\"yarn\",\"hcat\"]" - }, + "oracle_jdbc_url": "http://c6401.ambari.apache.org/resources//ojdbc6.jar";, + "ambari_db_rca_driver": "org.postgresql.Driver", + "ambari_db_rca_username": "mapred", + "jdk_name": "jdk-7u45-linux-x64.tar.gz", + "java_home": "/usr/jdk64/jdk1.7.0_45", + "mysql_jdbc_url": "http://c6401.ambari.apache.org/resources//mysql-connector-java.jar"; + }, + "repositoryFile": { + "resolved": true, + "repoVersion": "2.6.4.0-60", + "repositories": [ + { + "mirrorsList": null, + "ambariManaged": true, + "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.6.4.0-60";, + "repoName": "HDP", + "components": null, + "osType": "redhat6", + "distribution": null, + "repoId": "HDP-2.6-repo-1" + }, + { + "mirrorsList": null, + "ambariManaged": true, + "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP-GPL/centos6/2.x/BUILDS/2.6.4.0-60";, + "repoName": "HDP-GPL", + "components": null, + "osType": "redhat6", + "distribution": null, + "repoId": "HDP-2.6-GPL-repo-1" + }, + { + "mirrorsList": null, + "ambariManaged": true, + "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.22/repos/centos6";, + "repoName": "HDP-UTILS", + "components": null, + "osType": "redhat6", + "distribution": null, + "repoId": "HDP-UTILS-1.1.0.22-repo-1" + } + ], + "feature": { + "m_isScoped": true, + "m_isPreInstalled": false + }, + "stackName": "HDP", + "repoVersionId": 1 + }, + "agentLevelParams": { + "public_hostname": null, + "hostname": "c6401.ambari.apache.org", + "agentConfigParams": { + "agent": { + "parallel_execution": 0, + "use_system_proxy_settings": true + } + }, + "agentCacheDir": "/var/lib/ambari-agent/cache" + }, + "hostLevelParams": { + "recoveryConfig": { + "retryGap": "5", + "windowInMinutes": "60", + "maxLifetimeCount": "1024", + "components": "", + "maxCount": "6", + "type": "AUTO_START" + }, + "hostRepositories": { + "componentRepos": { + "NAMENODE": 1, + "SECONDARY_NAMENODE": 1, + "DATANODE": 1, + "HDFS_CLIENT": 1 + }, + "commandRepos": { + "1": { + "resolved": true, + "repoVersion": "2.1.4.0-60", + "repositories": [ + { + "mirrorsList": null, + "ambariManaged": true, + "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.6.4.0-60";, + "repoName": "HDP", + "components": null, + "osType": "redhat6", + "distribution": null, + "repoId": "HDP-2.6-repo-1" + }, + { + "mirrorsList": null, + "ambariManaged": true, + "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP-GPL/centos6/2.x/BUILDS/2.6.4.0-60";, + "repoName": "HDP-GPL", + "components": null, + "osType": "redhat6", + "distribution": null, + "repoId": "HDP-2.6-GPL-repo-1" + }, + { + "mirrorsList": null, + "ambariManaged": true, + "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.22/repos/centos6";, + "repoName": "HDP-UTILS", + "components": null, + "osType": "redhat6", + "distribution": null, + "repoId": "HDP-UTILS-1.1.0.22-repo-1" + } + ], + "feature": { + "m_isScoped": true, + "m_isPreInstalled": false + }, + "stackName": "HDP", + "repoVersionId": 1 + } + } + } + }, + "serviceLevelParams": { + "credentialStoreEnabled": false, + "status_commands_timeout": 300, + "version": "2.7.3", + "service_package_folder": "common-services/HDFS/2.1.0.2.0/package" + }, "commandType": "EXECUTION_COMMAND", "roleParams": { "component_category": "MASTER" http://git-wip-us.apache.org/repos/asf/ambari/blob/1e5a47e9/ambari-server/src/test/python/stacks/2.1/configs/secured-storm-start.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/configs/secured-storm-start.json b/ambari-server/src/test/python/stacks/2.1/configs/secured-storm-start.json index 6d7fdd1..e7448c4 100644 --- a/ambari-server/src/test/python/stacks/2.1/configs/secured-storm-start.json +++ b/ambari-server/src/test/python/stacks/2.1/configs/secured-storm-start.json @@ -12,7 +12,7 @@ "ZOOKEEPER_CLIENT", "NAMENODE" ], - "configuration_attributes": { + "configurationAttributes": { "storm-site": {}, "hdfs-site": { "final": { @@ -43,28 +43,155 @@ "roleCommand": "START", "clusterName": "pacan", "hostname": "c6402.ambari.apache.org", - "hostLevelParams": { + "clusterLevelParams": { + "stack_version": "2.2", "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]", - "jdk_location": "http://c6401.ambari.apache.org:8080/resources/";, - "ambari_db_rca_password": "mapred", - "java_home": "/usr/jdk64/jdk1.7.0_45", - "java_version": "8", - "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca", - "jce_name": "UnlimitedJCEPolicyJDK7.zip", - "oracle_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//ojdbc6.jar";, - "repo_info": "[{\"baseUrl\":\"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/updates/2.2.0.0\",\"osType\":\"redhat6\",\"repoId\":\"HDP-2.2\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/updates/2.2.0.0\",\"latestBaseUrl\":\"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/updates/2.2.0.0\"},{\"baseUrl\":\"http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.20/repos/centos6\",\"osType\":\"redhat6\",\"repoId\":\"HDP-UTILS-1.1.0.20\",\"repoName\":\"HDP-UTILS\",\"defaultBaseUrl\":\"http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.20/repos/centos6\",\"latestBaseUrl\":\"http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.20/repos/centos6\"}]";, - "group_list": "[\"hadoop\",\"users\"]", - "package_list": "[{\"name\":\"storm_2_2_0_0_*\"}]", - "stack_version": "2.2", + "hooks_folder": "stack-hooks", "stack_name": "HDP", + "group_list": "[\"hdfs\",\"hadoop\",\"users\"]", + "user_groups": "{\"hive\":[\"hadoop\"], \"oozie\":[\"hadoop\",\"users\"], \"nobody\":[\"hadoop\",\"nobody\"], \"ambari-qa\":[\"hadoop\",\"users\"], \"flume\":[\"hadoop\"], \"hdfs\":[\"hadoop\"], \"storm\":[\"hadoop\"], \"mapred\":[\"hadoop\"], \"hbase\":[\"hadoop\"], \"tez\":[\"hadoop\",\"users\"], \"zookeeper\":[\"hadoop\"], \"falcon\":[\"hadoop\",\"users\"], \"sqoop\":[\"hadoop\"], \"yarn\":[\"hadoop\"], \"hcat\":[\"hadoop\"]}", + "cluster_name": "c1", + "user_list": "[\"ambari-qa\",\"hdfs\"]" + }, + "ambariLevelParams": { + "jdk_location": "http://c6401.ambari.apache.org:8080/resources/";, + "agent_stack_retry_count": "5", + "db_driver_filename": "mysql-connector-java.jar", + "agent_stack_retry_on_unavailability": "false", + "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca", + "jce_name": "jce_policy-7.zip", + "java_version": "7", + "ambari_db_rca_password": "mapred", + "host_sys_prepped": "false", "db_name": "ambari", + "oracle_jdbc_url": "http://c6401.ambari.apache.org/resources//ojdbc6.jar";, "ambari_db_rca_driver": "org.postgresql.Driver", - "jdk_name": "jdk-7u45-linux-x64.tar.gz", "ambari_db_rca_username": "mapred", - "db_driver_filename": "mysql-connector-java.jar", - "user_list": "[\"ambari-qa\",\"zookeeper\",\"hdfs\",\"storm\"]", - "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar"; - }, + "jdk_name": "jdk-7u45-linux-x64.tar.gz", + "java_home": "/usr/jdk64/jdk1.7.0_45", + "mysql_jdbc_url": "http://c6401.ambari.apache.org/resources//mysql-connector-java.jar"; + }, + "repositoryFile": { + "resolved": true, + "repoVersion": "2.6.4.0-60", + "repositories": [ + { + "mirrorsList": null, + "ambariManaged": true, + "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.6.4.0-60";, + "repoName": "HDP", + "components": null, + "osType": "redhat6", + "distribution": null, + "repoId": "HDP-2.6-repo-1" + }, + { + "mirrorsList": null, + "ambariManaged": true, + "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP-GPL/centos6/2.x/BUILDS/2.6.4.0-60";, + "repoName": "HDP-GPL", + "components": null, + "osType": "redhat6", + "distribution": null, + "repoId": "HDP-2.6-GPL-repo-1" + }, + { + "mirrorsList": null, + "ambariManaged": true, + "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.22/repos/centos6";, + "repoName": "HDP-UTILS", + "components": null, + "osType": "redhat6", + "distribution": null, + "repoId": "HDP-UTILS-1.1.0.22-repo-1" + } + ], + "feature": { + "m_isScoped": true, + "m_isPreInstalled": false + }, + "stackName": "HDP", + "repoVersionId": 1 + }, + "agentLevelParams": { + "public_hostname": null, + "hostname": "c6401.ambari.apache.org", + "agentConfigParams": { + "agent": { + "parallel_execution": 0, + "use_system_proxy_settings": true + } + }, + "agentCacheDir": "/var/lib/ambari-agent/cache" + }, + "hostLevelParams": { + "recoveryConfig": { + "retryGap": "5", + "windowInMinutes": "60", + "maxLifetimeCount": "1024", + "components": "", + "maxCount": "6", + "type": "AUTO_START" + }, + "hostRepositories": { + "componentRepos": { + "NAMENODE": 1, + "SECONDARY_NAMENODE": 1, + "DATANODE": 1, + "HDFS_CLIENT": 1 + }, + "commandRepos": { + "1": { + "resolved": true, + "repoVersion": "2.1.4.0-60", + "repositories": [ + { + "mirrorsList": null, + "ambariManaged": true, + "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.6.4.0-60";, + "repoName": "HDP", + "components": null, + "osType": "redhat6", + "distribution": null, + "repoId": "HDP-2.6-repo-1" + }, + { + "mirrorsList": null, + "ambariManaged": true, + "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP-GPL/centos6/2.x/BUILDS/2.6.4.0-60";, + "repoName": "HDP-GPL", + "components": null, + "osType": "redhat6", + "distribution": null, + "repoId": "HDP-2.6-GPL-repo-1" + }, + { + "mirrorsList": null, + "ambariManaged": true, + "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.22/repos/centos6";, + "repoName": "HDP-UTILS", + "components": null, + "osType": "redhat6", + "distribution": null, + "repoId": "HDP-UTILS-1.1.0.22-repo-1" + } + ], + "feature": { + "m_isScoped": true, + "m_isPreInstalled": false + }, + "stackName": "HDP", + "repoVersionId": 1 + } + } + } + }, + "serviceLevelParams": { + "credentialStoreEnabled": false, + "status_commands_timeout": 300, + "version": "2.7.3", + "service_package_folder": "common-services/HDFS/2.1.0.2.0/package" + }, "commandType": "EXECUTION_COMMAND", "roleParams": {}, "serviceName": "STORM", @@ -420,7 +547,7 @@ "ambari_server_host": [ "c6401.ambari.apache.org" ], - "zookeeper_hosts": [ + "zookeeper_server_hosts": [ "c6402.ambari.apache.org" ], "supervisor_hosts": [ http://git-wip-us.apache.org/repos/asf/ambari/blob/1e5a47e9/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 48c4365..167f313 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 @@ -23,7 +23,7 @@ "service_package_folder": "common-services/HDFS/2.1.0.2.0/package", "script": "scripts/service_check.py", "hooks_folder": "stack-hooks", - "version": "2.2.1.0-2067", + "version": "2.1.1.0-2067", "command_timeout": "300", "script_type": "PYTHON" }, @@ -922,7 +922,7 @@ "XAAUDIT.SOLR.MAX_QUEUE_SIZE": "1" } }, - "configuration_attributes": { + "configurationAttributes": { "yarn-site": { "final": { "yarn.nodemanager.disk-health-checker.min-healthy-disks": "true", http://git-wip-us.apache.org/repos/asf/ambari/blob/1e5a47e9/ambari-server/src/test/python/stacks/2.2/configs/default.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/configs/default.json b/ambari-server/src/test/python/stacks/2.2/configs/default.json index bcb021b..2b2cdc3 100644 --- a/ambari-server/src/test/python/stacks/2.2/configs/default.json +++ b/ambari-server/src/test/python/stacks/2.2/configs/default.json @@ -2,22 +2,154 @@ "roleCommand": "SERVICE_CHECK", "clusterName": "c1", "hostname": "c6401.ambari.apache.org", - "hostLevelParams": { + "clusterLevelParams": { + "stack_version": "2.2", "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]", - "agent_stack_retry_count": "5", - "agent_stack_retry_on_unavailability": "false", - "jdk_location": "http://c6401.ambari.apache.org:8080/resources/";, - "ambari_db_rca_password": "mapred", - "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca", - "jce_name": "UnlimitedJCEPolicyJDK7.zip", - "stack_version": "2.2", - "stack_name": "HDP", - "ambari_db_rca_driver": "org.postgresql.Driver", - "jdk_name": "jdk-7u67-linux-x64.tar.gz", - "ambari_db_rca_username": "mapred", - "java_home": "/usr/jdk64/jdk1.7.0_45", - "java_version": "8", - "db_name": "ambari" + "hooks_folder": "stack-hooks", + "stack_name": "HDP", + "group_list": "[\"hdfs\",\"hadoop\",\"users\"]", + "user_groups": "{\"hive\":[\"hadoop\"], \"oozie\":[\"hadoop\",\"users\"], \"nobody\":[\"hadoop\",\"nobody\"], \"ambari-qa\":[\"hadoop\",\"users\"], \"flume\":[\"hadoop\"], \"hdfs\":[\"hadoop\"], \"storm\":[\"hadoop\"], \"mapred\":[\"hadoop\"], \"hbase\":[\"hadoop\"], \"tez\":[\"hadoop\",\"users\"], \"zookeeper\":[\"hadoop\"], \"falcon\":[\"hadoop\",\"users\"], \"sqoop\":[\"hadoop\"], \"yarn\":[\"hadoop\"], \"hcat\":[\"hadoop\"]}", + "cluster_name": "c1", + "user_list": "[\"ambari-qa\",\"hdfs\"]" + }, + "ambariLevelParams": { + "jdk_location": "http://c6401.ambari.apache.org:8080/resources/";, + "agent_stack_retry_count": "5", + "db_driver_filename": "mysql-connector-java.jar", + "agent_stack_retry_on_unavailability": "false", + "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca", + "jce_name": "jce_policy-7.zip", + "java_version": "7", + "ambari_db_rca_password": "mapred", + "host_sys_prepped": "false", + "db_name": "ambari", + "oracle_jdbc_url": "http://c6401.ambari.apache.org/resources//ojdbc6.jar";, + "ambari_db_rca_driver": "org.postgresql.Driver", + "ambari_db_rca_username": "mapred", + "jdk_name": "jdk-7u45-linux-x64.tar.gz", + "java_home": "/usr/jdk64/jdk1.7.0_45", + "mysql_jdbc_url": "http://c6401.ambari.apache.org/resources//mysql-connector-java.jar"; + }, + "repositoryFile": { + "resolved": true, + "repoVersion": "2.6.4.0-60", + "repositories": [ + { + "mirrorsList": null, + "ambariManaged": true, + "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.6.4.0-60";, + "repoName": "HDP", + "components": null, + "osType": "redhat6", + "distribution": null, + "repoId": "HDP-2.6-repo-1" + }, + { + "mirrorsList": null, + "ambariManaged": true, + "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP-GPL/centos6/2.x/BUILDS/2.6.4.0-60";, + "repoName": "HDP-GPL", + "components": null, + "osType": "redhat6", + "distribution": null, + "repoId": "HDP-2.6-GPL-repo-1" + }, + { + "mirrorsList": null, + "ambariManaged": true, + "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.22/repos/centos6";, + "repoName": "HDP-UTILS", + "components": null, + "osType": "redhat6", + "distribution": null, + "repoId": "HDP-UTILS-1.1.0.22-repo-1" + } + ], + "feature": { + "m_isScoped": true, + "m_isPreInstalled": false + }, + "stackName": "HDP", + "repoVersionId": 1 + }, + "agentLevelParams": { + "public_hostname": "c6401.ambari.apache.org", + "hostname": "c6401.ambari.apache.org", + "agentConfigParams": { + "agent": { + "parallel_execution": 0, + "use_system_proxy_settings": true + } + }, + "agentCacheDir": "/var/lib/ambari-agent/cache" + }, + "hostLevelParams": { + "recoveryConfig": { + "retryGap": "5", + "windowInMinutes": "60", + "maxLifetimeCount": "1024", + "components": "", + "maxCount": "6", + "type": "AUTO_START" + }, + "hostRepositories": { + "componentRepos": { + "NAMENODE": 1, + "SECONDARY_NAMENODE": 1, + "DATANODE": 1, + "HDFS_CLIENT": 1 + }, + "commandRepos": { + "1": { + "resolved": true, + "repoVersion": "2.1.4.0-60", + "repositories": [ + { + "mirrorsList": null, + "ambariManaged": true, + "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.6.4.0-60";, + "repoName": "HDP", + "components": null, + "osType": "redhat6", + "distribution": null, + "repoId": "HDP-2.6-repo-1" + }, + { + "mirrorsList": null, + "ambariManaged": true, + "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP-GPL/centos6/2.x/BUILDS/2.6.4.0-60";, + "repoName": "HDP-GPL", + "components": null, + "osType": "redhat6", + "distribution": null, + "repoId": "HDP-2.6-GPL-repo-1" + }, + { + "mirrorsList": null, + "ambariManaged": true, + "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.22/repos/centos6";, + "repoName": "HDP-UTILS", + "components": null, + "osType": "redhat6", + "distribution": null, + "repoId": "HDP-UTILS-1.1.0.22-repo-1" + } + ], + "feature": { + "m_isScoped": true, + "m_isPreInstalled": false + }, + "stackName": "HDP", + "repoVersionId": 1 + } + } + } + }, + "serviceLevelParams": { + "credentialStoreEnabled": false, + "status_commands_timeout": 300, + "version": "2.7.3", + "service_package_folder": "common-services/HDFS/2.1.0.2.0/package" }, "commandType": "EXECUTION_COMMAND", "roleParams": {}, @@ -384,7 +516,7 @@ "debug_num_logs": "10" } }, - "configuration_attributes": { + "configurationAttributes": { "yarn-site": { "final": { "yarn.nodemanager.disk-health-checker.min-healthy-disks": "true", @@ -473,7 +605,7 @@ "kafka_broker_hosts": [ "c6401.ambari.apache.org" ], - "zookeeper_hosts": [ + "zookeeper_server_hosts": [ "c6401.ambari.apache.org" ] http://git-wip-us.apache.org/repos/asf/ambari/blob/1e5a47e9/ambari-server/src/test/python/stacks/2.2/configs/default_custom_path_config.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/configs/default_custom_path_config.json b/ambari-server/src/test/python/stacks/2.2/configs/default_custom_path_config.json index 8c168ca..8e9e392 100644 --- a/ambari-server/src/test/python/stacks/2.2/configs/default_custom_path_config.json +++ b/ambari-server/src/test/python/stacks/2.2/configs/default_custom_path_config.json @@ -295,7 +295,7 @@ "ranger-hive-plugin-enabled":"yes" } }, - "configuration_attributes": { + "configurationAttributes": { "yarn-site": { "final": { "yarn.nodemanager.disk-health-checker.min-healthy-disks": "true", @@ -384,7 +384,7 @@ "kafka_broker_hosts": [ "c6401.ambari.apache.org" ], - "zookeeper_hosts": [ + "zookeeper_server_hosts": [ "c6401.ambari.apache.org" ] http://git-wip-us.apache.org/repos/asf/ambari/blob/1e5a47e9/ambari-server/src/test/python/stacks/2.2/configs/falcon-upgrade.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/configs/falcon-upgrade.json b/ambari-server/src/test/python/stacks/2.2/configs/falcon-upgrade.json index 7ded3a0..9c09bfa 100644 --- a/ambari-server/src/test/python/stacks/2.2/configs/falcon-upgrade.json +++ b/ambari-server/src/test/python/stacks/2.2/configs/falcon-upgrade.json @@ -1,5 +1,5 @@ { - "configuration_attributes": { + "configurationAttributes": { "falcon-startup.properties": {}, "falcon-runtime.properties": {}, "hdfs-site": { @@ -29,28 +29,155 @@ "kerberosCommandParams": [], "clusterName": "c1", "hostname": "c6402.ambari.apache.org", - "hostLevelParams": { + "clusterLevelParams": { + "stack_version": "2.1", "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]", - "jdk_location": "http://hw10897.ix:8080/resources/";, - "ambari_db_rca_password": "mapred", - "java_home": "/usr/jdk64/jdk1.7.0_45", - "java_version": "8", - "ambari_db_rca_url": "jdbc:postgresql://hw10897.ix/ambarirca", + "hooks_folder": "stack-hooks", "stack_name": "HDP", - "custom_command": "RESTART", - "oracle_jdbc_url": "http://hw10897.ix:8080/resources//ojdbc6.jar";, - "repo_info": "[{\"baseUrl\":\"http://repo.ambari.apache.org/hdp/centos6/HDP-2.2.0.0/\",\"osType\":\"redhat6\",\"repoId\":\"HDP-2.2\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/GA/2.2.0.0\",\"latestBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/GA/2.2.0.0\"},{\"baseUrl\":\"http://repo.ambari.apache.org/hdp/centos6/HDP-UTILS-1.1.0.20/\",\"osType\":\"redhat6\",\"repoId\":\"HDP-UTILS-1.1.0.20\",\"repoName\":\"HDP-UTILS\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.20/repos/centos6\",\"latestBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.20/repos/centos6\"}]";, - "group_list": "[\"hadoop\",\"nobody\",\"users\"]", - "agentCacheDir": "/var/lib/ambari-agent/cache", - "stack_version": "2.2", + "group_list": "[\"hdfs\",\"hadoop\",\"users\"]", + "user_groups": "{\"hive\":[\"hadoop\"], \"oozie\":[\"hadoop\",\"users\"], \"nobody\":[\"hadoop\",\"nobody\"], \"ambari-qa\":[\"hadoop\",\"users\"], \"flume\":[\"hadoop\"], \"hdfs\":[\"hadoop\"], \"storm\":[\"hadoop\"], \"mapred\":[\"hadoop\"], \"hbase\":[\"hadoop\"], \"tez\":[\"hadoop\",\"users\"], \"zookeeper\":[\"hadoop\"], \"falcon\":[\"hadoop\",\"users\"], \"sqoop\":[\"hadoop\"], \"yarn\":[\"hadoop\"], \"hcat\":[\"hadoop\"]}", + "cluster_name": "c1", + "user_list": "[\"ambari-qa\",\"hdfs\"]" + }, + "ambariLevelParams": { + "jdk_location": "http://c6401.ambari.apache.org:8080/resources/";, + "agent_stack_retry_count": "5", + "db_driver_filename": "mysql-connector-java.jar", + "agent_stack_retry_on_unavailability": "false", + "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca", + "jce_name": "jce_policy-7.zip", + "java_version": "7", + "ambari_db_rca_password": "mapred", + "host_sys_prepped": "false", "db_name": "ambari", + "oracle_jdbc_url": "http://c6401.ambari.apache.org/resources//ojdbc6.jar";, "ambari_db_rca_driver": "org.postgresql.Driver", - "jdk_name": "jdk-7u45-linux-x64.tar.gz", "ambari_db_rca_username": "mapred", - "db_driver_filename": "mysql-connector-java.jar", - "user_list": "[\"nobody\",\"oozie\",\"hive\",\"mapred\",\"hbase\",\"ambari-qa\",\"zookeeper\",\"tez\",\"hdfs\",\"falcon\",\"yarn\",\"hcat\"]", - "mysql_jdbc_url": "http://hw10897.ix:8080/resources//mysql-connector-java.jar"; - }, + "jdk_name": "jdk-7u45-linux-x64.tar.gz", + "java_home": "/usr/jdk64/jdk1.7.0_45", + "mysql_jdbc_url": "http://c6401.ambari.apache.org/resources//mysql-connector-java.jar"; + }, + "repositoryFile": { + "resolved": true, + "repoVersion": "2.6.4.0-60", + "repositories": [ + { + "mirrorsList": null, + "ambariManaged": true, + "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.6.4.0-60";, + "repoName": "HDP", + "components": null, + "osType": "redhat6", + "distribution": null, + "repoId": "HDP-2.6-repo-1" + }, + { + "mirrorsList": null, + "ambariManaged": true, + "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP-GPL/centos6/2.x/BUILDS/2.6.4.0-60";, + "repoName": "HDP-GPL", + "components": null, + "osType": "redhat6", + "distribution": null, + "repoId": "HDP-2.6-GPL-repo-1" + }, + { + "mirrorsList": null, + "ambariManaged": true, + "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.22/repos/centos6";, + "repoName": "HDP-UTILS", + "components": null, + "osType": "redhat6", + "distribution": null, + "repoId": "HDP-UTILS-1.1.0.22-repo-1" + } + ], + "feature": { + "m_isScoped": true, + "m_isPreInstalled": false + }, + "stackName": "HDP", + "repoVersionId": 1 + }, + "agentLevelParams": { + "public_hostname": null, + "hostname": "c6401.ambari.apache.org", + "agentConfigParams": { + "agent": { + "parallel_execution": 0, + "use_system_proxy_settings": true + } + }, + "agentCacheDir": "/var/lib/ambari-agent/cache" + }, + "hostLevelParams": { + "recoveryConfig": { + "retryGap": "5", + "windowInMinutes": "60", + "maxLifetimeCount": "1024", + "components": "", + "maxCount": "6", + "type": "AUTO_START" + }, + "hostRepositories": { + "componentRepos": { + "NAMENODE": 1, + "SECONDARY_NAMENODE": 1, + "DATANODE": 1, + "HDFS_CLIENT": 1 + }, + "commandRepos": { + "1": { + "resolved": true, + "repoVersion": "2.1.4.0-60", + "repositories": [ + { + "mirrorsList": null, + "ambariManaged": true, + "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.6.4.0-60";, + "repoName": "HDP", + "components": null, + "osType": "redhat6", + "distribution": null, + "repoId": "HDP-2.6-repo-1" + }, + { + "mirrorsList": null, + "ambariManaged": true, + "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP-GPL/centos6/2.x/BUILDS/2.6.4.0-60";, + "repoName": "HDP-GPL", + "components": null, + "osType": "redhat6", + "distribution": null, + "repoId": "HDP-2.6-GPL-repo-1" + }, + { + "mirrorsList": null, + "ambariManaged": true, + "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.22/repos/centos6";, + "repoName": "HDP-UTILS", + "components": null, + "osType": "redhat6", + "distribution": null, + "repoId": "HDP-UTILS-1.1.0.22-repo-1" + } + ], + "feature": { + "m_isScoped": true, + "m_isPreInstalled": false + }, + "stackName": "HDP", + "repoVersionId": 1 + } + } + } + }, + "serviceLevelParams": { + "credentialStoreEnabled": false, + "status_commands_timeout": 300, + "version": "2.7.3", + "service_package_folder": "common-services/HDFS/2.1.0.2.0/package" + }, "commandType": "EXECUTION_COMMAND", "roleParams": { "component_category": "MASTER" @@ -311,7 +438,7 @@ "webhcat_server_host": [ "c6402.ambari.apache.org" ], - "zookeeper_hosts": [ + "zookeeper_server_hosts": [ "c6403.ambari.apache.org", "c6401.ambari.apache.org", "c6402.ambari.apache.org" http://git-wip-us.apache.org/repos/asf/ambari/blob/1e5a47e9/ambari-server/src/test/python/stacks/2.2/configs/hive-upgrade.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/configs/hive-upgrade.json b/ambari-server/src/test/python/stacks/2.2/configs/hive-upgrade.json index 7a29ea0..b25bc38 100644 --- a/ambari-server/src/test/python/stacks/2.2/configs/hive-upgrade.json +++ b/ambari-server/src/test/python/stacks/2.2/configs/hive-upgrade.json @@ -1,5 +1,5 @@ { - "configuration_attributes": { + "configurationAttributes": { "webhcat-env": {}, "hcat-env": {}, "hdfs-site": { @@ -663,7 +663,7 @@ "ambari_server_host": [ "hw10897.ix" ], - "zookeeper_hosts": [ + "zookeeper_server_hosts": [ "c6403.ambari.apache.org", "c6401.ambari.apache.org", "c6402.ambari.apache.org" http://git-wip-us.apache.org/repos/asf/ambari/blob/1e5a47e9/ambari-server/src/test/python/stacks/2.2/configs/journalnode-upgrade-hdfs-secure.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/configs/journalnode-upgrade-hdfs-secure.json b/ambari-server/src/test/python/stacks/2.2/configs/journalnode-upgrade-hdfs-secure.json index 03068e5..f392392 100644 --- a/ambari-server/src/test/python/stacks/2.2/configs/journalnode-upgrade-hdfs-secure.json +++ b/ambari-server/src/test/python/stacks/2.2/configs/journalnode-upgrade-hdfs-secure.json @@ -1,5 +1,5 @@ { - "configuration_attributes": { + "configurationAttributes": { "mapred-site": {}, "sqoop-env": {}, "pig-env": {}, @@ -1252,7 +1252,7 @@ "ambari_server_host": [ "c6406.ambari.apache.org" ], - "zookeeper_hosts": [ + "zookeeper_server_hosts": [ "c6408.ambari.apache.org", "c6407.ambari.apache.org", "c6406.ambari.apache.org" http://git-wip-us.apache.org/repos/asf/ambari/blob/1e5a47e9/ambari-server/src/test/python/stacks/2.2/configs/journalnode-upgrade.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/configs/journalnode-upgrade.json b/ambari-server/src/test/python/stacks/2.2/configs/journalnode-upgrade.json index 7f874cd..51882db 100644 --- a/ambari-server/src/test/python/stacks/2.2/configs/journalnode-upgrade.json +++ b/ambari-server/src/test/python/stacks/2.2/configs/journalnode-upgrade.json @@ -1,5 +1,5 @@ { - "configuration_attributes": { + "configurationAttributes": { "mapred-site": {}, "sqoop-env": {}, "pig-env": {}, @@ -1250,7 +1250,7 @@ "ambari_server_host": [ "c6406.ambari.apache.org" ], - "zookeeper_hosts": [ + "zookeeper_server_hosts": [ "c6408.ambari.apache.org", "c6407.ambari.apache.org", "c6406.ambari.apache.org" http://git-wip-us.apache.org/repos/asf/ambari/blob/1e5a47e9/ambari-server/src/test/python/stacks/2.2/configs/knox_upgrade.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/configs/knox_upgrade.json b/ambari-server/src/test/python/stacks/2.2/configs/knox_upgrade.json index c3e3f94..d491652 100644 --- a/ambari-server/src/test/python/stacks/2.2/configs/knox_upgrade.json +++ b/ambari-server/src/test/python/stacks/2.2/configs/knox_upgrade.json @@ -1,5 +1,5 @@ { - "configuration_attributes": { + "configurationAttributes": { "gateway-log4j": {}, "knox-env": {}, "ldap-log4j": {}, http://git-wip-us.apache.org/repos/asf/ambari/blob/1e5a47e9/ambari-server/src/test/python/stacks/2.2/configs/oozie-downgrade.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/configs/oozie-downgrade.json b/ambari-server/src/test/python/stacks/2.2/configs/oozie-downgrade.json index fb561f7..ca7da66 100644 --- a/ambari-server/src/test/python/stacks/2.2/configs/oozie-downgrade.json +++ b/ambari-server/src/test/python/stacks/2.2/configs/oozie-downgrade.json @@ -1,5 +1,5 @@ { - "configuration_attributes": { + "configurationAttributes": { "oozie-env": {}, "hdfs-site": { "final": { @@ -259,7 +259,7 @@ "webhcat_server_host": [ "c6402.ambari.apache.org" ], - "zookeeper_hosts": [ + "zookeeper_server_hosts": [ "c6403.ambari.apache.org", "c6401.ambari.apache.org", "c6402.ambari.apache.org" http://git-wip-us.apache.org/repos/asf/ambari/blob/1e5a47e9/ambari-server/src/test/python/stacks/2.2/configs/oozie-upgrade.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/configs/oozie-upgrade.json b/ambari-server/src/test/python/stacks/2.2/configs/oozie-upgrade.json index 29cbddc..dbffaca 100644 --- a/ambari-server/src/test/python/stacks/2.2/configs/oozie-upgrade.json +++ b/ambari-server/src/test/python/stacks/2.2/configs/oozie-upgrade.json @@ -1,5 +1,5 @@ { - "configuration_attributes": { + "configurationAttributes": { "oozie-env": {}, "hdfs-site": { "final": { @@ -263,7 +263,7 @@ "webhcat_server_host": [ "c6402.ambari.apache.org" ], - "zookeeper_hosts": [ + "zookeeper_server_hosts": [ "c6403.ambari.apache.org", "c6401.ambari.apache.org", "c6402.ambari.apache.org" http://git-wip-us.apache.org/repos/asf/ambari/blob/1e5a47e9/ambari-server/src/test/python/stacks/2.2/configs/pig-service-check-secure.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/configs/pig-service-check-secure.json b/ambari-server/src/test/python/stacks/2.2/configs/pig-service-check-secure.json index 0ac9e78..4e4c43b 100644 --- a/ambari-server/src/test/python/stacks/2.2/configs/pig-service-check-secure.json +++ b/ambari-server/src/test/python/stacks/2.2/configs/pig-service-check-secure.json @@ -1,5 +1,5 @@ { - "configuration_attributes": { + "configurationAttributes": { "mapred-site": {}, "pig-env": {}, "ranger-hdfs-plugin-properties": {}, @@ -639,7 +639,7 @@ "ambari_server_host": [ "c6401.ambari.apache.org" ], - "zookeeper_hosts": [ + "zookeeper_server_hosts": [ "c6403.ambari.apache.org", "c6401.ambari.apache.org", "c6402.ambari.apache.org" http://git-wip-us.apache.org/repos/asf/ambari/blob/1e5a47e9/ambari-server/src/test/python/stacks/2.2/configs/ranger-admin-default.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/configs/ranger-admin-default.json b/ambari-server/src/test/python/stacks/2.2/configs/ranger-admin-default.json index 151c886..3a16c8e 100644 --- a/ambari-server/src/test/python/stacks/2.2/configs/ranger-admin-default.json +++ b/ambari-server/src/test/python/stacks/2.2/configs/ranger-admin-default.json @@ -218,7 +218,7 @@ "ranger-hive-plugin-enabled":"yes" } }, - "configuration_attributes": { + "configurationAttributes": { "yarn-site": { "final": { "yarn.nodemanager.disk-health-checker.min-healthy-disks": "true", @@ -301,7 +301,7 @@ "kafka_broker_hosts": [ "c6401.ambari.apache.org" ], - "zookeeper_hosts": [ + "zookeeper_server_hosts": [ "c6401.ambari.apache.org" ], "ranger_admin_hosts": [ http://git-wip-us.apache.org/repos/asf/ambari/blob/1e5a47e9/ambari-server/src/test/python/stacks/2.2/configs/ranger-admin-secured.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/configs/ranger-admin-secured.json b/ambari-server/src/test/python/stacks/2.2/configs/ranger-admin-secured.json index 64ee4b1..3de50b7 100644 --- a/ambari-server/src/test/python/stacks/2.2/configs/ranger-admin-secured.json +++ b/ambari-server/src/test/python/stacks/2.2/configs/ranger-admin-secured.json @@ -152,7 +152,7 @@ "content": "envproperties\nline2" } }, - "configuration_attributes": {}, + "configurationAttributes": {}, "configurationTags": { "slider-client": { "tag": "version1" @@ -186,7 +186,7 @@ "c6401.ambari.apache.org", "c6402.ambari.apache.org" ], - "zookeeper_hosts": [ + "zookeeper_server_hosts": [ "c6401.ambari.apache.org" ] } http://git-wip-us.apache.org/repos/asf/ambari/blob/1e5a47e9/ambari-server/src/test/python/stacks/2.2/configs/ranger-admin-upgrade.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/configs/ranger-admin-upgrade.json b/ambari-server/src/test/python/stacks/2.2/configs/ranger-admin-upgrade.json index cbe8ebe..015532d 100644 --- a/ambari-server/src/test/python/stacks/2.2/configs/ranger-admin-upgrade.json +++ b/ambari-server/src/test/python/stacks/2.2/configs/ranger-admin-upgrade.json @@ -1,5 +1,5 @@ { - "configuration_attributes": { + "configurationAttributes": { "spark-defaults": {}, "mapred-site": {}, "krb5-conf": {}, @@ -999,7 +999,7 @@ "rm_host": [ "c6408.ambari.apache.org" ], - "zookeeper_hosts": [ + "zookeeper_server_hosts": [ "c6408.ambari.apache.org", "c6407.ambari.apache.org", "c6409.ambari.apache.org" http://git-wip-us.apache.org/repos/asf/ambari/blob/1e5a47e9/ambari-server/src/test/python/stacks/2.2/configs/ranger-usersync-upgrade.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/configs/ranger-usersync-upgrade.json b/ambari-server/src/test/python/stacks/2.2/configs/ranger-usersync-upgrade.json index dc4c43b..8654502 100644 --- a/ambari-server/src/test/python/stacks/2.2/configs/ranger-usersync-upgrade.json +++ b/ambari-server/src/test/python/stacks/2.2/configs/ranger-usersync-upgrade.json @@ -1,5 +1,5 @@ { - "configuration_attributes": { + "configurationAttributes": { "spark-defaults": {}, "mapred-site": {}, "krb5-conf": {}, @@ -994,7 +994,7 @@ "rm_host": [ "c6408.ambari.apache.org" ], - "zookeeper_hosts": [ + "zookeeper_server_hosts": [ "c6408.ambari.apache.org", "c6407.ambari.apache.org", "c6409.ambari.apache.org" http://git-wip-us.apache.org/repos/asf/ambari/blob/1e5a47e9/ambari-server/src/test/python/stacks/2.2/configs/secured.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/configs/secured.json b/ambari-server/src/test/python/stacks/2.2/configs/secured.json index 9b17aa3..8196283 100644 --- a/ambari-server/src/test/python/stacks/2.2/configs/secured.json +++ b/ambari-server/src/test/python/stacks/2.2/configs/secured.json @@ -200,7 +200,7 @@ "knox_user": "knox" } }, - "configuration_attributes": {}, + "configurationAttributes": {}, "configurationTags": { "slider-client": { "tag": "version1" http://git-wip-us.apache.org/repos/asf/ambari/blob/1e5a47e9/ambari-server/src/test/python/stacks/2.2/configs/spark-job-history-server.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/configs/spark-job-history-server.json b/ambari-server/src/test/python/stacks/2.2/configs/spark-job-history-server.json index 5769244..b20f94a 100644 --- a/ambari-server/src/test/python/stacks/2.2/configs/spark-job-history-server.json +++ b/ambari-server/src/test/python/stacks/2.2/configs/spark-job-history-server.json @@ -1,5 +1,5 @@ { - "configuration_attributes": { + "configurationAttributes": { "spark-defaults": {}, "spark-javaopts-properties": {}, "spark-log4j-properties": {}, http://git-wip-us.apache.org/repos/asf/ambari/blob/1e5a47e9/ambari-server/src/test/python/stacks/2.3/configs/ats_1_5.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.3/configs/ats_1_5.json b/ambari-server/src/test/python/stacks/2.3/configs/ats_1_5.json index 475a6f9..f61f3d2 100644 --- a/ambari-server/src/test/python/stacks/2.3/configs/ats_1_5.json +++ b/ambari-server/src/test/python/stacks/2.3/configs/ats_1_5.json @@ -857,7 +857,7 @@ "timeline.metrics.host.aggregator.hourly.interval": "3600" } }, - "configuration_attributes": { + "configurationAttributes": { "ams-hbase-env": {}, "ams-hbase-security-site": {}, "ams-log4j": {}, @@ -1051,7 +1051,7 @@ "webhcat_server_host": [ "c6402.ambari.apache.org" ], - "zookeeper_hosts": [ + "zookeeper_server_hosts": [ "c6401.ambari.apache.org", "c6402.ambari.apache.org" ], http://git-wip-us.apache.org/repos/asf/ambari/blob/1e5a47e9/ambari-server/src/test/python/stacks/2.3/configs/default.hbasedecom.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.3/configs/default.hbasedecom.json b/ambari-server/src/test/python/stacks/2.3/configs/default.hbasedecom.json index ad21c9b..72c8925 100644 --- a/ambari-server/src/test/python/stacks/2.3/configs/default.hbasedecom.json +++ b/ambari-server/src/test/python/stacks/2.3/configs/default.hbasedecom.json @@ -547,7 +547,7 @@ "content": "\n# Set Hadoop-specific environment variables here.\n\n#Set path to where bin/hadoop is available\n#Set path to where bin/hadoop is available\nexport HADOOP_HOME=${HADOOP_HOME:-/usr/lib/hadoop}\n\n#set the path to where bin/hbase is available\nexport HBASE_HOME=${HBASE_HOME:-/usr/lib/hbase}\n\n#Set the path to where bin/hive is available\nexport HIVE_HOME=${HIVE_HOME:-/usr/lib/hive}\n\n#Set the path for where zookeper config dir is\nexport ZOOCFGDIR=${ZOOCFGDIR:-/etc/zookeeper/conf}\n\n# add libthrift in hive to sqoop class path first so hive imports work\nexport SQOOP_USER_CLASSPATH=\"`ls ${HIVE_HOME}/lib/libthrift-*.jar 2> /dev/null`:${SQOOP_USER_CLASSPATH}\"" } }, - "configuration_attributes": { + "configurationAttributes": { "mapred-site": { "final": { "mapred.healthChecker.script.path": "true", @@ -666,7 +666,7 @@ "webhcat_server_host": [ "c6402.ambari.apache.org" ], - "zookeeper_hosts": [ + "zookeeper_server_hosts": [ "c6401.ambari.apache.org", "c6402.ambari.apache.org" ], http://git-wip-us.apache.org/repos/asf/ambari/blob/1e5a47e9/ambari-server/src/test/python/stacks/2.3/configs/default.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.3/configs/default.json b/ambari-server/src/test/python/stacks/2.3/configs/default.json index a50708f..c9bd277 100644 --- a/ambari-server/src/test/python/stacks/2.3/configs/default.json +++ b/ambari-server/src/test/python/stacks/2.3/configs/default.json @@ -2,21 +2,154 @@ "roleCommand": "SERVICE_CHECK", "clusterName": "c1", "hostname": "c6401.ambari.apache.org", - "hostLevelParams": { + "clusterLevelParams": { + "stack_version": "2.3", "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]", - "agent_stack_retry_count": "5", - "agent_stack_retry_on_unavailability": "false", - "jdk_location": "http://c6401.ambari.apache.org:8080/resources/";, - "ambari_db_rca_password": "mapred", - "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca", - "jce_name": "UnlimitedJCEPolicyJDK7.zip", - "stack_version": "2.3", - "stack_name": "HDP", - "ambari_db_rca_driver": "org.postgresql.Driver", - "jdk_name": "jdk-7u67-linux-x64.tar.gz", - "ambari_db_rca_username": "mapred", - "java_home": "/usr/jdk64/jdk1.7.0_45", - "db_name": "ambari" + "hooks_folder": "stack-hooks", + "stack_name": "HDP", + "group_list": "[\"hdfs\",\"hadoop\",\"users\"]", + "user_groups": "{\"hive\":[\"hadoop\"], \"oozie\":[\"hadoop\",\"users\"], \"nobody\":[\"hadoop\",\"nobody\"], \"ambari-qa\":[\"hadoop\",\"users\"], \"flume\":[\"hadoop\"], \"hdfs\":[\"hadoop\"], \"storm\":[\"hadoop\"], \"mapred\":[\"hadoop\"], \"hbase\":[\"hadoop\"], \"tez\":[\"hadoop\",\"users\"], \"zookeeper\":[\"hadoop\"], \"falcon\":[\"hadoop\",\"users\"], \"sqoop\":[\"hadoop\"], \"yarn\":[\"hadoop\"], \"hcat\":[\"hadoop\"]}", + "cluster_name": "c1", + "user_list": "[\"ambari-qa\",\"hdfs\"]" + }, + "ambariLevelParams": { + "jdk_location": "http://c6401.ambari.apache.org:8080/resources/";, + "agent_stack_retry_count": "5", + "db_driver_filename": "mysql-connector-java.jar", + "agent_stack_retry_on_unavailability": "false", + "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca", + "jce_name": "jce_policy-7.zip", + "java_version": "7", + "ambari_db_rca_password": "mapred", + "host_sys_prepped": "false", + "db_name": "ambari", + "oracle_jdbc_url": "http://c6401.ambari.apache.org/resources//ojdbc6.jar";, + "ambari_db_rca_driver": "org.postgresql.Driver", + "ambari_db_rca_username": "mapred", + "jdk_name": "jdk-7u45-linux-x64.tar.gz", + "java_home": "/usr/jdk64/jdk1.7.0_45", + "mysql_jdbc_url": "http://c6401.ambari.apache.org/resources//mysql-connector-java.jar"; + }, + "repositoryFile": { + "resolved": true, + "repoVersion": "2.6.4.0-60", + "repositories": [ + { + "mirrorsList": null, + "ambariManaged": true, + "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.6.4.0-60";, + "repoName": "HDP", + "components": null, + "osType": "redhat6", + "distribution": null, + "repoId": "HDP-2.6-repo-1" + }, + { + "mirrorsList": null, + "ambariManaged": true, + "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP-GPL/centos6/2.x/BUILDS/2.6.4.0-60";, + "repoName": "HDP-GPL", + "components": null, + "osType": "redhat6", + "distribution": null, + "repoId": "HDP-2.6-GPL-repo-1" + }, + { + "mirrorsList": null, + "ambariManaged": true, + "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.22/repos/centos6";, + "repoName": "HDP-UTILS", + "components": null, + "osType": "redhat6", + "distribution": null, + "repoId": "HDP-UTILS-1.1.0.22-repo-1" + } + ], + "feature": { + "m_isScoped": true, + "m_isPreInstalled": false + }, + "stackName": "HDP", + "repoVersionId": 1 + }, + "agentLevelParams": { + "public_hostname": "c6401.ambari.apache.org", + "hostname": "c6401.ambari.apache.org", + "agentConfigParams": { + "agent": { + "parallel_execution": 0, + "use_system_proxy_settings": true + } + }, + "agentCacheDir": "/var/lib/ambari-agent/cache" + }, + "hostLevelParams": { + "recoveryConfig": { + "retryGap": "5", + "windowInMinutes": "60", + "maxLifetimeCount": "1024", + "components": "", + "maxCount": "6", + "type": "AUTO_START" + }, + "hostRepositories": { + "componentRepos": { + "NAMENODE": 1, + "SECONDARY_NAMENODE": 1, + "DATANODE": 1, + "HDFS_CLIENT": 1 + }, + "commandRepos": { + "1": { + "resolved": true, + "repoVersion": "2.1.4.0-60", + "repositories": [ + { + "mirrorsList": null, + "ambariManaged": true, + "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.6.4.0-60";, + "repoName": "HDP", + "components": null, + "osType": "redhat6", + "distribution": null, + "repoId": "HDP-2.6-repo-1" + }, + { + "mirrorsList": null, + "ambariManaged": true, + "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP-GPL/centos6/2.x/BUILDS/2.6.4.0-60";, + "repoName": "HDP-GPL", + "components": null, + "osType": "redhat6", + "distribution": null, + "repoId": "HDP-2.6-GPL-repo-1" + }, + { + "mirrorsList": null, + "ambariManaged": true, + "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.22/repos/centos6";, + "repoName": "HDP-UTILS", + "components": null, + "osType": "redhat6", + "distribution": null, + "repoId": "HDP-UTILS-1.1.0.22-repo-1" + } + ], + "feature": { + "m_isScoped": true, + "m_isPreInstalled": false + }, + "stackName": "HDP", + "repoVersionId": 1 + } + } + } + }, + "serviceLevelParams": { + "credentialStoreEnabled": false, + "status_commands_timeout": 300, + "version": "2.7.3", + "service_package_folder": "common-services/HDFS/2.1.0.2.0/package" }, "commandType": "EXECUTION_COMMAND", "roleParams": {}, @@ -245,7 +378,7 @@ "xml_configurations_supported" : "true" } }, - "configuration_attributes": { + "configurationAttributes": { "sqoop-site": {}, "yarn-site": { "final": { @@ -348,7 +481,7 @@ "infra_solr_hosts": [ "c6401.ambari.apache.org" ], - "zookeeper_hosts": [ + "zookeeper_server_hosts": [ "c6401.ambari.apache.org" ], "atlas_server_hosts": [ http://git-wip-us.apache.org/repos/asf/ambari/blob/1e5a47e9/ambari-server/src/test/python/stacks/2.3/configs/hbase_default.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.3/configs/hbase_default.json b/ambari-server/src/test/python/stacks/2.3/configs/hbase_default.json index 0da58ce..a0493a0 100644 --- a/ambari-server/src/test/python/stacks/2.3/configs/hbase_default.json +++ b/ambari-server/src/test/python/stacks/2.3/configs/hbase_default.json @@ -1,5 +1,5 @@ { - "configuration_attributes": { + "configurationAttributes": { "core-site": { "final": { "fs.defaultFS": "true" @@ -402,7 +402,7 @@ "ambari_server_host": [ "c6405.ambari.apache.org" ], - "zookeeper_hosts": [ + "zookeeper_server_hosts": [ "c6405.ambari.apache.org" ] } http://git-wip-us.apache.org/repos/asf/ambari/blob/1e5a47e9/ambari-server/src/test/python/stacks/2.3/configs/hbase_secure.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.3/configs/hbase_secure.json b/ambari-server/src/test/python/stacks/2.3/configs/hbase_secure.json index fd482db..d952f9a 100644 --- a/ambari-server/src/test/python/stacks/2.3/configs/hbase_secure.json +++ b/ambari-server/src/test/python/stacks/2.3/configs/hbase_secure.json @@ -1,5 +1,5 @@ { - "configuration_attributes": { + "configurationAttributes": { "ranger-knox-plugin-properties": {}, "gateway-log4j": {}, "ranger-hdfs-plugin-properties": {}, @@ -722,7 +722,7 @@ "ambari_server_host": [ "c6405.ambari.apache.org" ], - "zookeeper_hosts": [ + "zookeeper_server_hosts": [ "c6405.ambari.apache.org" ], "supervisor_hosts": [ http://git-wip-us.apache.org/repos/asf/ambari/blob/1e5a47e9/ambari-server/src/test/python/stacks/2.3/configs/secure.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.3/configs/secure.json b/ambari-server/src/test/python/stacks/2.3/configs/secure.json index e2a3d1d..28ca4e4 100644 --- a/ambari-server/src/test/python/stacks/2.3/configs/secure.json +++ b/ambari-server/src/test/python/stacks/2.3/configs/secure.json @@ -243,7 +243,7 @@ "realm" : "EXAMPLE.COM" } }, - "configuration_attributes": { + "configurationAttributes": { "yarn-site": { "final": { "yarn.nodemanager.disk-health-checker.min-healthy-disks": "true", @@ -345,7 +345,7 @@ "infra_solr_hosts": [ "c6401.ambari.apache.org" ], - "zookeeper_hosts": [ + "zookeeper_server_hosts": [ "c6401.ambari.apache.org" ], "atlas_server_hosts": [ http://git-wip-us.apache.org/repos/asf/ambari/blob/1e5a47e9/ambari-server/src/test/python/stacks/2.3/configs/spark_default.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.3/configs/spark_default.json b/ambari-server/src/test/python/stacks/2.3/configs/spark_default.json index ce982a1..ebb3379 100644 --- a/ambari-server/src/test/python/stacks/2.3/configs/spark_default.json +++ b/ambari-server/src/test/python/stacks/2.3/configs/spark_default.json @@ -396,7 +396,7 @@ "debug_num_logs": "10" } }, - "configuration_attributes": { + "configurationAttributes": { "yarn-site": { "final": { "yarn.nodemanager.disk-health-checker.min-healthy-disks": "true", @@ -485,7 +485,7 @@ "kafka_broker_hosts": [ "c6401.ambari.apache.org" ], - "zookeeper_hosts": [ + "zookeeper_server_hosts": [ "c6401.ambari.apache.org" ], "spark_thriftserver_hosts": [ http://git-wip-us.apache.org/repos/asf/ambari/blob/1e5a47e9/ambari-server/src/test/python/stacks/2.3/configs/storm_default.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.3/configs/storm_default.json b/ambari-server/src/test/python/stacks/2.3/configs/storm_default.json index b69a311..e840899 100644 --- a/ambari-server/src/test/python/stacks/2.3/configs/storm_default.json +++ b/ambari-server/src/test/python/stacks/2.3/configs/storm_default.json @@ -1,5 +1,5 @@ { - "configuration_attributes": { + "configurationAttributes": { "storm-site": {}, "storm-env": {}, "zoo.cfg": {}, @@ -238,7 +238,7 @@ "ambari_server_host": [ "c6401.ambari.apache.org" ], - "zookeeper_hosts": [ + "zookeeper_server_hosts": [ "c6402.ambari.apache.org", "c6403.ambari.apache.org", "c6401.ambari.apache.org" http://git-wip-us.apache.org/repos/asf/ambari/blob/1e5a47e9/ambari-server/src/test/python/stacks/2.3/configs/storm_default_secure.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.3/configs/storm_default_secure.json b/ambari-server/src/test/python/stacks/2.3/configs/storm_default_secure.json index 8abff9f..8e87dfb 100644 --- a/ambari-server/src/test/python/stacks/2.3/configs/storm_default_secure.json +++ b/ambari-server/src/test/python/stacks/2.3/configs/storm_default_secure.json @@ -1,5 +1,5 @@ { - "configuration_attributes": { + "configurationAttributes": { "storm-site": {}, "storm-env": {}, "zoo.cfg": {}, @@ -250,7 +250,7 @@ "ambari_server_host": [ "c6401.ambari.apache.org" ], - "zookeeper_hosts": [ + "zookeeper_server_hosts": [ "c6402.ambari.apache.org", "c6403.ambari.apache.org", "c6401.ambari.apache.org" http://git-wip-us.apache.org/repos/asf/ambari/blob/1e5a47e9/ambari-server/src/test/python/stacks/2.4/configs/default.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.4/configs/default.json b/ambari-server/src/test/python/stacks/2.4/configs/default.json index 9966f3e..5c3b8ea 100644 --- a/ambari-server/src/test/python/stacks/2.4/configs/default.json +++ b/ambari-server/src/test/python/stacks/2.4/configs/default.json @@ -2,21 +2,154 @@ "roleCommand": "SERVICE_CHECK", "clusterName": "c1", "hostname": "c6401.ambari.apache.org", - "hostLevelParams": { + "clusterLevelParams": { + "stack_version": "2.3", "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]", - "agent_stack_retry_count": "5", - "agent_stack_retry_on_unavailability": "false", - "jdk_location": "http://c6401.ambari.apache.org:8080/resources/";, - "ambari_db_rca_password": "mapred", - "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca", - "jce_name": "UnlimitedJCEPolicyJDK7.zip", - "stack_version": "2.3", - "stack_name": "HDP", - "ambari_db_rca_driver": "org.postgresql.Driver", - "jdk_name": "jdk-7u67-linux-x64.tar.gz", - "ambari_db_rca_username": "mapred", - "java_home": "/usr/jdk64/jdk1.7.0_45", - "db_name": "ambari" + "hooks_folder": "stack-hooks", + "stack_name": "HDP", + "group_list": "[\"hdfs\",\"hadoop\",\"users\"]", + "user_groups": "{\"hive\":[\"hadoop\"], \"oozie\":[\"hadoop\",\"users\"], \"nobody\":[\"hadoop\",\"nobody\"], \"ambari-qa\":[\"hadoop\",\"users\"], \"flume\":[\"hadoop\"], \"hdfs\":[\"hadoop\"], \"storm\":[\"hadoop\"], \"mapred\":[\"hadoop\"], \"hbase\":[\"hadoop\"], \"tez\":[\"hadoop\",\"users\"], \"zookeeper\":[\"hadoop\"], \"falcon\":[\"hadoop\",\"users\"], \"sqoop\":[\"hadoop\"], \"yarn\":[\"hadoop\"], \"hcat\":[\"hadoop\"]}", + "cluster_name": "c1", + "user_list": "[\"ambari-qa\",\"hdfs\"]" + }, + "ambariLevelParams": { + "jdk_location": "http://c6401.ambari.apache.org:8080/resources/";, + "agent_stack_retry_count": "5", + "db_driver_filename": "mysql-connector-java.jar", + "agent_stack_retry_on_unavailability": "false", + "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca", + "jce_name": "jce_policy-7.zip", + "java_version": "7", + "ambari_db_rca_password": "mapred", + "host_sys_prepped": "false", + "db_name": "ambari", + "oracle_jdbc_url": "http://c6401.ambari.apache.org/resources//ojdbc6.jar";, + "ambari_db_rca_driver": "org.postgresql.Driver", + "ambari_db_rca_username": "mapred", + "jdk_name": "jdk-7u45-linux-x64.tar.gz", + "java_home": "/usr/jdk64/jdk1.7.0_45", + "mysql_jdbc_url": "http://c6401.ambari.apache.org/resources//mysql-connector-java.jar"; + }, + "repositoryFile": { + "resolved": true, + "repoVersion": "2.6.4.0-60", + "repositories": [ + { + "mirrorsList": null, + "ambariManaged": true, + "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.6.4.0-60";, + "repoName": "HDP", + "components": null, + "osType": "redhat6", + "distribution": null, + "repoId": "HDP-2.6-repo-1" + }, + { + "mirrorsList": null, + "ambariManaged": true, + "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP-GPL/centos6/2.x/BUILDS/2.6.4.0-60";, + "repoName": "HDP-GPL", + "components": null, + "osType": "redhat6", + "distribution": null, + "repoId": "HDP-2.6-GPL-repo-1" + }, + { + "mirrorsList": null, + "ambariManaged": true, + "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.22/repos/centos6";, + "repoName": "HDP-UTILS", + "components": null, + "osType": "redhat6", + "distribution": null, + "repoId": "HDP-UTILS-1.1.0.22-repo-1" + } + ], + "feature": { + "m_isScoped": true, + "m_isPreInstalled": false + }, + "stackName": "HDP", + "repoVersionId": 1 + }, + "agentLevelParams": { + "public_hostname": "c6401.ambari.apache.org", + "hostname": "c6401.ambari.apache.org", + "agentConfigParams": { + "agent": { + "parallel_execution": 0, + "use_system_proxy_settings": true + } + }, + "agentCacheDir": "/var/lib/ambari-agent/cache" + }, + "hostLevelParams": { + "recoveryConfig": { + "retryGap": "5", + "windowInMinutes": "60", + "maxLifetimeCount": "1024", + "components": "", + "maxCount": "6", + "type": "AUTO_START" + }, + "hostRepositories": { + "componentRepos": { + "NAMENODE": 1, + "SECONDARY_NAMENODE": 1, + "DATANODE": 1, + "HDFS_CLIENT": 1 + }, + "commandRepos": { + "1": { + "resolved": true, + "repoVersion": "2.1.4.0-60", + "repositories": [ + { + "mirrorsList": null, + "ambariManaged": true, + "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.6.4.0-60";, + "repoName": "HDP", + "components": null, + "osType": "redhat6", + "distribution": null, + "repoId": "HDP-2.6-repo-1" + }, + { + "mirrorsList": null, + "ambariManaged": true, + "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP-GPL/centos6/2.x/BUILDS/2.6.4.0-60";, + "repoName": "HDP-GPL", + "components": null, + "osType": "redhat6", + "distribution": null, + "repoId": "HDP-2.6-GPL-repo-1" + }, + { + "mirrorsList": null, + "ambariManaged": true, + "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.22/repos/centos6";, + "repoName": "HDP-UTILS", + "components": null, + "osType": "redhat6", + "distribution": null, + "repoId": "HDP-UTILS-1.1.0.22-repo-1" + } + ], + "feature": { + "m_isScoped": true, + "m_isPreInstalled": false + }, + "stackName": "HDP", + "repoVersionId": 1 + } + } + } + }, + "serviceLevelParams": { + "credentialStoreEnabled": false, + "status_commands_timeout": 300, + "version": "2.7.3", + "service_package_folder": "common-services/HDFS/2.1.0.2.0/package" }, "credentialStoreEnabled": "true", "commandType": "EXECUTION_COMMAND", @@ -342,7 +475,7 @@ "content": "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n<!--\n Licensed to the Apache Software Foundation (ASF) under one or more\n contributor license agreements. See the NOTICE file distributed with\n this work for additional information regarding copyright ownership.\n The ASF licenses this file to You under the Apache License, Version 2.0\n (the \"License\"); you may not use this file except in compliance with\n the License. You may obtain a copy of the License at\n\n http://www.apache.org/licenses/LICENSE-2.0\n\n Unless required by applicable law or agreed to in writing, software\n distributed under the License is distributed on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n See the License for the specific language governing permissions and\n limitations under the License.\n-->\n<!DOCTYPE log4j:configuration SYSTEM \"log4j.dtd\">\n<log4j:configuration xmlns:log4j=\"http://jakarta. apache.org/log4j/\">\n <appender name=\"console\" class=\"org.apache.log4j.ConsoleAppender\">\n <param name=\"Target\" value=\"System.out\" />\n <layout class=\"org.apache.log4j.PatternLayout\">\n <param name=\"ConversionPattern\" value=\"%d [%t] %-5p %C{6} (%F:%L) - %m%n\" />\n </layout>\n </appender>\n\n <appender name=\"rolling_file\" class=\"org.apache.log4j.RollingFileAppender\"> \n <param name=\"file\" value=\"{{logfeeder_log_dir}}/logfeeder.log\" />\n <param name=\"append\" value=\"true\" /> \n <param name=\"maxFileSize\" value=\"10MB\" /> \n <param name=\"maxBackupIndex\" value=\"10\" /> \n <layout class=\"org.apache.log4j.PatternLayout\"> \n <param name=\"ConversionPattern\" value=\"%d [%t] %-5p %C{6} (%F:%L) - %m%n\"/> \n </layout> \n </appender> \n\n <category name=\"org.apache.ambari.logfeeder\" additivity=\"false\">\n <priori ty value=\"info\" />\n <appender-ref ref=\"rolling_file\" />\n </category>\n\n <root>\n <priority value=\"warn\" />\n <appender-ref ref=\"rolling_file\" />\n </root>\n</log4j:configuration>" } }, - "configuration_attributes": { + "configurationAttributes": { "sqoop-site": {}, "yarn-site": { "final": { @@ -437,7 +570,7 @@ "8670", "8670" ], - "rm_host": [ + "resourcemanager_hosts": [ "c6402.ambari.apache.org" ], "all_hosts": [ @@ -450,7 +583,7 @@ "kafka_broker_hosts": [ "c6401.ambari.apache.org" ], - "zookeeper_hosts": [ + "zookeeper_server_hosts": [ "c6401.ambari.apache.org" ], "infra_solr_hosts": [
