Repository: ambari Updated Branches: refs/heads/trunk 82afeb3f1 -> 3060730c8
AMBARI-5076. Datanode Start fails in Secure cluster. (jaimin) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3060730c Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3060730c Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3060730c Branch: refs/heads/trunk Commit: 3060730c878065cea662c9273f1bd08969b0709d Parents: 82afeb3 Author: Jaimin Jetly <[email protected]> Authored: Thu Mar 13 15:43:17 2014 -0700 Committer: Jaimin Jetly <[email protected]> Committed: Thu Mar 13 15:43:28 2014 -0700 ---------------------------------------------------------------------- .../stacks/HDP/2.0.6/hooks/before-START/scripts/params.py | 2 +- .../test/python/stacks/2.0.6/configs/default.hbasedecom.json | 2 +- ambari-server/src/test/python/stacks/2.0.6/configs/default.json | 2 +- .../src/test/python/stacks/2.0.6/configs/ha_default.json | 2 +- .../src/test/python/stacks/2.0.6/configs/ha_secured.json | 2 +- ambari-server/src/test/python/stacks/2.0.6/configs/secured.json | 5 ++--- 6 files changed, 7 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/3060730c/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py index 38494da..6de8130 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py @@ -116,7 +116,7 @@ else: #hadoop-env.sh java_home = config['hostLevelParams']['java_home'] -if config['hostLevelParams']['stack_version'] == '2.0.6' and System.get_instance().os_family != "suse": +if str(config['hostLevelParams']['stack_version']).startswith('2.0') and System.get_instance().os_family != "suse": # deprecated rhel jsvc_path jsvc_path = "/usr/libexec/bigtop-utils" else: http://git-wip-us.apache.org/repos/asf/ambari/blob/3060730c/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 30cfb60..e8bca9d 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 @@ -7,7 +7,7 @@ "ambari_db_rca_password": "mapred", "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca", "jce_name": "UnlimitedJCEPolicyJDK7.zip", - "stack_version": "2.0.8", + "stack_version": "2.0", "stack_name": "HDP", "ambari_db_rca_driver": "org.postgresql.Driver", "jdk_name": "jdk-7u45-linux-x64.tar.gz", http://git-wip-us.apache.org/repos/asf/ambari/blob/3060730c/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 10f9f3c..1689cce 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 @@ -7,7 +7,7 @@ "ambari_db_rca_password": "mapred", "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca", "jce_name": "UnlimitedJCEPolicyJDK7.zip", - "stack_version": "2.0.8", + "stack_version": "2.0", "stack_name": "HDP", "ambari_db_rca_driver": "org.postgresql.Driver", "jdk_name": "jdk-7u45-linux-x64.tar.gz", http://git-wip-us.apache.org/repos/asf/ambari/blob/3060730c/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 254f3a1..924ed64 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 @@ -11,7 +11,7 @@ "oracle_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//ojdbc6.jar";, "repo_info": "[{\"baseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\",\"osType\":\"centos6\",\"repoId\":\"HDP-2.0.6\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\"}]";, "package_list": "[{\"type\":\"rpm\",\"name\":\"hadoop-yarn\"},{\"type\":\"rpm\",\"name\":\"hadoop-yarn-nodemanager\"},{\"type\":\"rpm\",\"name\":\"hadoop-mapreduce\"},{\"type\":\"rpm\",\"name\":\"hadoop-yarn-proxyserver\"},{\"type\":\"rpm\",\"name\":\"hadoop-yarn-resourcemanager\"}]", - "stack_version": "2.0.6", + "stack_version": "2.0", "stack_name": "HDP", "db_name": "ambari", "ambari_db_rca_driver": "org.postgresql.Driver", http://git-wip-us.apache.org/repos/asf/ambari/blob/3060730c/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 7db1bbd..e64b87a 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 @@ -11,7 +11,7 @@ "oracle_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//ojdbc6.jar";, "repo_info": "[{\"baseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\",\"osType\":\"centos6\",\"repoId\":\"HDP-2.0.6\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\"}]";, "package_list": "[{\"type\":\"rpm\",\"name\":\"lzo\"},{\"type\":\"rpm\",\"name\":\"hadoop\"},{\"type\":\"rpm\",\"name\":\"hadoop-libhdfs\"},{\"type\":\"rpm\",\"name\":\"hadoop-lzo\"},{\"type\":\"rpm\",\"name\":\"hadoop-lzo-native\"},{\"type\":\"rpm\",\"name\":\"snappy\"},{\"type\":\"rpm\",\"name\":\"snappy-devel\"},{\"type\":\"rpm\",\"name\":\"ambari-log4j\"}]", - "stack_version": "2.0.6", + "stack_version": "2.0", "stack_name": "HDP", "db_name": "ambari", "ambari_db_rca_driver": "org.postgresql.Driver", http://git-wip-us.apache.org/repos/asf/ambari/blob/3060730c/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 96d5300..f5297e2 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 @@ -10,15 +10,14 @@ "oracle_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//ojdbc6.jar";, "repo_info": "[{\"baseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\",\"osType\":\"centos6\",\"repoId\":\"HDP-2.0.8\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\"}]";, "package_list": "[{\"type\":\"rpm\",\"name\":\"hadoop-yarn\"},{\"type\":\"rpm\",\"name\":\"hadoop-yarn-nodemanager\"},{\"type\":\"rpm\",\"name\":\"hadoop-mapreduce\"},{\"type\":\"rpm\",\"name\":\"hadoop-yarn-proxyserver\"},{\"type\":\"rpm\",\"name\":\"hadoop-yarn-resourcemanager\"}]", - "stack_version": "2.0.8", + "stack_version": "2.0", "stack_name": "HDP", "db_name": "ambari", "ambari_db_rca_driver": "org.postgresql.Driver", "jdk_name": "jdk-7u45-linux-x64.tar.gz", "ambari_db_rca_username": "mapred", "java_home": "/usr/jdk64/jdk1.7.0_45", - "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar";, - "db_name": "ambari" + "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar"; }, "commandType": "EXECUTION_COMMAND", "roleParams": {},
