Updated Branches: refs/heads/branch-1.2.5 83339b183 -> 0a29a33a4
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/0a29a33a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/0a29a33a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/0a29a33a Branch: refs/heads/branch-1.2.5 Commit: 0a29a33a48ffe4c2759c9a5e1dd27d050cf072a0 Parents: 83339b1 Author: Jaimin Jetly <[email protected]> Authored: Tue Aug 6 18:28:59 2013 -0700 Committer: Jaimin Jetly <[email protected]> Committed: Tue Aug 6 18:30:10 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/secure_mapping.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/0a29a33a/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 0b01575..1ea3c48 100644 --- a/ambari-web/app/controllers/main/service/info/configs.js +++ b/ambari-web/app/controllers/main/service/info/configs.js @@ -1023,7 +1023,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/0a29a33a/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 5f73e27..42fda6c 100644 --- a/ambari-web/app/controllers/wizard/step8_controller.js +++ b/ambari-web/app/controllers/wizard/step8_controller.js @@ -208,7 +208,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/0a29a33a/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 54fce80..7233f0e 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" },
