You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2015/09/03 15:55:29 UTC
ambari git commit: AMBARI-12996 Test connection for SQLA fails on
Ambari UI even after db is created. (ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 8b31a2627 -> c3a81ca00
AMBARI-12996 Test connection for SQLA fails on Ambari UI even after db is created. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c3a81ca0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c3a81ca0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c3a81ca0
Branch: refs/heads/trunk
Commit: c3a81ca000a07246492a3c60665174a1f9e193cb
Parents: 8b31a26
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Thu Sep 3 16:53:54 2015 +0300
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Thu Sep 3 16:53:54 2015 +0300
----------------------------------------------------------------------
ambari-web/app/views/common/controls_view.js | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/c3a81ca0/ambari-web/app/views/common/controls_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/controls_view.js b/ambari-web/app/views/common/controls_view.js
index e052e31..1eb7aa9 100644
--- a/ambari-web/app/views/common/controls_view.js
+++ b/ambari-web/app/views/common/controls_view.js
@@ -1129,8 +1129,8 @@ App.CheckDBConnectionView = Ember.View.extend({
OOZIE: ['oozie.db.schema.name', 'oozie.service.JPAService.jdbc.username', 'oozie.service.JPAService.jdbc.password', 'oozie.service.JPAService.jdbc.driver', 'oozie.service.JPAService.jdbc.url'],
HIVE: ['ambari.hive.db.schema.name', 'javax.jdo.option.ConnectionUserName', 'javax.jdo.option.ConnectionPassword', 'javax.jdo.option.ConnectionDriverName', 'javax.jdo.option.ConnectionURL'],
KERBEROS: ['kdc_host'],
- RANGER: App.get('isHadoop23Stack') ? ['db_root_user', 'db_root_password', 'db_name', 'ranger.jpa.jdbc.url', 'ranger.jpa.jdbc.driver'] :
- ['db_root_user', 'db_root_password', 'db_name', 'ranger_jdbc_connection_url', 'ranger_jdbc_driver']
+ RANGER: App.get('isHadoop23Stack') ? ['db_user', 'db_password', 'db_name', 'ranger.jpa.jdbc.url', 'ranger.jpa.jdbc.driver'] :
+ ['db_user', 'db_password', 'db_name', 'ranger_jdbc_connection_url', 'ranger_jdbc_driver']
};
return propertiesMap[this.get('parentView.service.serviceName')];
}.property('App.isHadoop23Stack'),
@@ -1140,8 +1140,8 @@ App.CheckDBConnectionView = Ember.View.extend({
db_connection_url: /jdbc\.url|connection_url|connectionurl|kdc_host/ig
};
if (this.get('parentView.service.serviceName') != "KERBEROS") {
- patterns.user_name = /(username|dblogin|root_user)$/ig;
- patterns.user_passwd = /(dbpassword|password|root_password)$/ig;
+ patterns.user_name = /(username|dblogin|db_user)$/ig;
+ patterns.user_passwd = /(dbpassword|password|db_password)$/ig;
}
return patterns;
}.property('parentView.service.serviceName'),