Updated Branches: refs/heads/trunk bdc0d78da -> 49f3bdced
AMBARI-2826: webhcat-site.xml configuration should have hive.metastore.warehouse.dir. (jaimin) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/49f3bdce Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/49f3bdce Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/49f3bdce Branch: refs/heads/trunk Commit: 49f3bdced5cb43f78ea5e3f5356df123e071338b Parents: bdc0d78 Author: Jaimin Jetly <[email protected]> Authored: Tue Aug 6 18:27:16 2013 -0700 Committer: Jaimin Jetly <[email protected]> Committed: Tue Aug 6 18:27:16 2013 -0700 ---------------------------------------------------------------------- ambari-web/app/controllers/main/service/info/configs.js | 2 +- ambari-web/app/controllers/wizard/step8_controller.js | 2 +- ambari-web/app/data/HDP2/secure_mapping.js | 2 +- ambari-web/app/data/secure_mapping.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/49f3bdce/ambari-web/app/controllers/main/service/info/configs.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/service/info/configs.js b/ambari-web/app/controllers/main/service/info/configs.js index 86a2cf1..5850df3 100644 --- a/ambari-web/app/controllers/main/service/info/configs.js +++ b/ambari-web/app/controllers/main/service/info/configs.js @@ -1031,7 +1031,7 @@ App.MainServiceInfoConfigsController = Em.Controller.extend({ "name": "templeton.hive.properties", "templateName": ["hivemetastore_host"], "foreignKey": null, - "value": "hive.metastore.local=false,hive.metastore.uris=thrift://<templateName[0]>:9083,hive.metastore.sasl.enabled=yes,hive.metastore.execute.setugi=true", + "value": "hive.metastore.local=false,hive.metastore.uris=thrift://<templateName[0]>:9083,hive.metastore.sasl.enabled=yes,hive.metastore.execute.setugi=true,hive.metastore.warehouse.dir=/apps/hive/warehouse", "filename": "webhcat-site.xml" }); } http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/49f3bdce/ambari-web/app/controllers/wizard/step8_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/wizard/step8_controller.js b/ambari-web/app/controllers/wizard/step8_controller.js index f44bb89..46a74b3 100644 --- a/ambari-web/app/controllers/wizard/step8_controller.js +++ b/ambari-web/app/controllers/wizard/step8_controller.js @@ -212,7 +212,7 @@ App.WizardStep8Controller = Em.Controller.extend({ "name": "templeton.hive.properties", "templateName": ["hivemetastore_host"], "foreignKey": null, - "value": "hive.metastore.local=false,hive.metastore.uris=thrift://<templateName[0]>:9083,hive.metastore.sasl.enabled=yes,hive.metastore.execute.setugi=true", + "value": "hive.metastore.local=false,hive.metastore.uris=thrift://<templateName[0]>:9083,hive.metastore.sasl.enabled=yes,hive.metastore.execute.setugi=true,hive.metastore.warehouse.dir=/apps/hive/warehouse", "filename": "webhcat-site.xml" }); } http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/49f3bdce/ambari-web/app/data/HDP2/secure_mapping.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/data/HDP2/secure_mapping.js b/ambari-web/app/data/HDP2/secure_mapping.js index 681d447..95fc517 100644 --- a/ambari-web/app/data/HDP2/secure_mapping.js +++ b/ambari-web/app/data/HDP2/secure_mapping.js @@ -399,7 +399,7 @@ module.exports = [ "templateName": ["hivemetastore_host","hive_metastore_principal_name","kerberos_domain"], "foreignKey": null, "value": "hive.metastore.local=false,hive.metastore.uris=thrift://<templateName[0]>:9083,hive." + - "metastore.sasl.enabled=true,hive.metastore.execute.setugi=true,hive.exec.mode.local.auto=false,hive.metastore.kerberos.principal=<templateName[1]>@<templateName[2]>", + "metastore.sasl.enabled=true,hive.metastore.execute.setugi=true,hive.metastore.warehouse.dir=/apps/hive/warehouse,hive.exec.mode.local.auto=false,hive.metastore.kerberos.principal=<templateName[1]>@<templateName[2]>", "filename": "webhcat-site.xml", "serviceName": "WEBHCAT" }, http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/49f3bdce/ambari-web/app/data/secure_mapping.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/data/secure_mapping.js b/ambari-web/app/data/secure_mapping.js index b7847e5..781ae3b 100644 --- a/ambari-web/app/data/secure_mapping.js +++ b/ambari-web/app/data/secure_mapping.js @@ -376,7 +376,7 @@ module.exports = [ "templateName": ["hivemetastore_host","hive_metastore_principal_name","kerberos_domain"], "foreignKey": null, "value": "hive.metastore.local=false,hive.metastore.uris=thrift://<templateName[0]>:9083,hive." + - "metastore.sasl.enabled=true,hive.metastore.execute.setugi=true,hive.exec.mode.local.auto=false,hive.metastore.kerberos.principal=<templateName[1]>@<templateName[2]>", + "metastore.sasl.enabled=true,hive.metastore.execute.setugi=true,hive.metastore.warehouse.dir=/apps/hive/warehouse,hive.exec.mode.local.auto=false,hive.metastore.kerberos.principal=<templateName[1]>@<templateName[2]>", "filename": "webhcat-site.xml", "serviceName": "WEBHCAT" },
