You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ja...@apache.org on 2015/08/25 00:09:05 UTC
ambari git commit: AMBARI-12865. Duplicate label 'Ranger DB Host' in
Customize Services page of Add Service Wizard. (jaimin)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1.1 3b72d911c -> b697122b0
AMBARI-12865. Duplicate label 'Ranger DB Host' in Customize Services page of Add Service Wizard. (jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b697122b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b697122b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b697122b
Branch: refs/heads/branch-2.1.1
Commit: b697122b0d1c8a6f736a54d8f68fec3a765e49fd
Parents: 3b72d91
Author: Jaimin Jetly <ja...@hortonworks.com>
Authored: Mon Aug 24 15:08:25 2015 -0700
Committer: Jaimin Jetly <ja...@hortonworks.com>
Committed: Mon Aug 24 15:08:25 2015 -0700
----------------------------------------------------------------------
ambari-web/app/data/HDP2.2/site_properties.js | 74 +---------------------
ambari-web/app/data/HDP2.3/site_properties.js | 68 ++++++++++++++++++++
ambari-web/app/utils/configs/database.js | 15 +++--
3 files changed, 80 insertions(+), 77 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/b697122b/ambari-web/app/data/HDP2.2/site_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2.2/site_properties.js b/ambari-web/app/data/HDP2.2/site_properties.js
index dde84f1..019a4eb 100644
--- a/ambari-web/app/data/HDP2.2/site_properties.js
+++ b/ambari-web/app/data/HDP2.2/site_properties.js
@@ -450,12 +450,10 @@ hdp22properties.push(
"isReconfigurable": true,
"options": [
{
- displayName: 'MYSQL',
- foreignKeys: ['ranger_mysql_database', 'ranger_mysql_host']
+ displayName: 'MYSQL'
},
{
- displayName: 'ORACLE',
- foreignKeys: ['ranger_oracle_database', 'ranger_oracle_host']
+ displayName: 'ORACLE'
}
],
"displayType": "radio button",
@@ -509,74 +507,6 @@ hdp22properties.push(
"index": 5
},
{
- "name": "ranger_mysql_database",
- "id": "puppet var",
- "displayName": "Database Type",
- "value": "",
- "recommendedValue": "MySQL",
- "description": "Using a MySQL database for Ranger",
- "displayType": "masterHost",
- "isOverridable": false,
- "isVisible": false,
- "isReconfigurable": false,
- "isRequiredByAgent": false,
- "serviceName": "RANGER",
- "filename": "admin-properties.xml",
- "category": "DBSettings",
- "index": 1
- },
- {
- "name": "ranger_oracle_database",
- "id": "puppet var",
- "displayName": "Database Type",
- "value": "",
- "recommendedValue": "ORACLE",
- "description": "Using an Oracle database for Ranger",
- "displayType": "masterHost",
- "isOverridable": false,
- "isVisible": false,
- "isReconfigurable": false,
- "isRequiredByAgent": false,
- "serviceName": "RANGER",
- "filename": "admin-properties.xml",
- "category": "DBSettings",
- "index": 2
- },
- {
- "name": "ranger_mysql_host",
- "id": "puppet var",
- "displayName": "Ranger DB host",
- "description": "Specify the host on which the existing database is hosted",
- "recommendedValue": "",
- "value": "",
- "displayType": "host",
- "isOverridable": false,
- "isVisible": false,
- "isObserved": true,
- "isRequiredByAgent": false,
- "serviceName": "RANGER",
- "filename": "admin-properties.xml",
- "category": "DBSettings",
- "index": 6
- },
- {
- "name": "ranger_oracle_host",
- "id": "puppet var",
- "displayName": "Ranger DB host",
- "description": "Specify the host on which the existing database is hosted",
- "recommendedValue": "",
- "value": "",
- "displayType": "host",
- "isOverridable": false,
- "isVisible": false,
- "isObserved": true,
- "isRequiredByAgent": false,
- "serviceName": "RANGER",
- "filename": "admin-properties.xml",
- "category": "DBSettings",
- "index": 7
- },
- {
"id": "site property",
"name": "db_root_password",
"displayName": "Ranger DB root password",
http://git-wip-us.apache.org/repos/asf/ambari/blob/b697122b/ambari-web/app/data/HDP2.3/site_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2.3/site_properties.js b/ambari-web/app/data/HDP2.3/site_properties.js
index d4372ab..82721dc 100644
--- a/ambari-web/app/data/HDP2.3/site_properties.js
+++ b/ambari-web/app/data/HDP2.3/site_properties.js
@@ -106,6 +106,40 @@ hdp23properties.push({
"index": 2
},
{
+ "name": "ranger_mysql_database",
+ "id": "puppet var",
+ "displayName": "Database Type",
+ "value": "",
+ "recommendedValue": "MySQL",
+ "description": "Using a MySQL database for Ranger",
+ "displayType": "masterHost",
+ "isOverridable": false,
+ "isVisible": false,
+ "isReconfigurable": false,
+ "isRequiredByAgent": false,
+ "serviceName": "RANGER",
+ "filename": "admin-properties.xml",
+ "category": "DBSettings",
+ "index": 1
+ },
+ {
+ "name": "ranger_oracle_database",
+ "id": "puppet var",
+ "displayName": "Database Type",
+ "value": "",
+ "recommendedValue": "ORACLE",
+ "description": "Using an Oracle database for Ranger",
+ "displayType": "masterHost",
+ "isOverridable": false,
+ "isVisible": false,
+ "isReconfigurable": false,
+ "isRequiredByAgent": false,
+ "serviceName": "RANGER",
+ "filename": "admin-properties.xml",
+ "category": "DBSettings",
+ "index": 2
+ },
+ {
"name": "ranger_postgres_database",
"id": "puppet var",
"displayName": "Database Type",
@@ -514,6 +548,40 @@ hdp23properties.push({
"serviceName": "KAFKA"
},
{
+ "name": "ranger_mysql_host",
+ "id": "puppet var",
+ "displayName": "Ranger DB host",
+ "description": "Specify the host on which the existing database is hosted",
+ "recommendedValue": "",
+ "value": "",
+ "displayType": "host",
+ "isOverridable": false,
+ "isVisible": false,
+ "isObserved": true,
+ "isRequiredByAgent": false,
+ "serviceName": "RANGER",
+ "filename": "admin-properties.xml",
+ "category": "DBSettings",
+ "index": 6
+ },
+ {
+ "name": "ranger_oracle_host",
+ "id": "puppet var",
+ "displayName": "Ranger DB host",
+ "description": "Specify the host on which the existing database is hosted",
+ "recommendedValue": "",
+ "value": "",
+ "displayType": "host",
+ "isOverridable": false,
+ "isVisible": false,
+ "isObserved": true,
+ "isRequiredByAgent": false,
+ "serviceName": "RANGER",
+ "filename": "admin-properties.xml",
+ "category": "DBSettings",
+ "index": 7
+ },
+ {
"name": "ranger_postgres_host",
"id": "puppet var",
"displayName": "Ranger DB host",
http://git-wip-us.apache.org/repos/asf/ambari/blob/b697122b/ambari-web/app/utils/configs/database.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/configs/database.js b/ambari-web/app/utils/configs/database.js
index 37fd0ae..d2b5ff8 100644
--- a/ambari-web/app/utils/configs/database.js
+++ b/ambari-web/app/utils/configs/database.js
@@ -143,11 +143,16 @@ module.exports = {
*/
getPropsByOptions: function (databaseTypeProperty) {
Em.assert('Property related to database type should contains `options` attribute', databaseTypeProperty.get('options'));
- return databaseTypeProperty.options.mapProperty('foreignKeys').reduce(function (p, c) {
- return p.concat(c);
- }).uniq().map(function (name) {
- return App.config.get('preDefinedSiteProperties').findProperty('name', name) || null;
- }).compact();
+ var result = [];
+ var dbTypeAndHostname = databaseTypeProperty.options.mapProperty('foreignKeys').without(undefined);
+ if (!!dbTypeAndHostname.length) {
+ result = dbTypeAndHostname.reduce(function (p, c) {
+ return p.concat(c);
+ }).uniq().map(function (name) {
+ return App.config.get('preDefinedSiteProperties').findProperty('name', name) || null;
+ }).compact();
+ }
+ return result;
},
/**