ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ababiic...@apache.org
Subject [2/2] ambari git commit: AMBARI-15015 UI adds config properties that are not necessary. (ababiichuk)
Date Thu, 11 Feb 2016 15:45:45 GMT
AMBARI-15015 UI adds config properties that are not necessary. (ababiichuk)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b3460634
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b3460634
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b3460634

Branch: refs/heads/branch-2.2
Commit: b3460634012500765dc54317cc1c28b77780c336
Parents: d3d66f2
Author: ababiichuk <ababiichuk@hortonworks.com>
Authored: Thu Feb 11 16:00:06 2016 +0200
Committer: ababiichuk <ababiichuk@hortonworks.com>
Committed: Thu Feb 11 16:01:57 2016 +0200

----------------------------------------------------------------------
 .../app/controllers/wizard/step8_controller.js  | 30 +++++++++++---------
 1 file changed, 17 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/b3460634/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 aa1d97b..747bf83 100644
--- a/ambari-web/app/controllers/wizard/step8_controller.js
+++ b/ambari-web/app/controllers/wizard/step8_controller.js
@@ -1559,15 +1559,17 @@ App.WizardStep8Controller = Em.Controller.extend(App.AddSecurityConfigs,
App.wiz
       isGLUSTERFSSelected = installedAndSelectedServices.someProperty('serviceName', 'GLUSTERFS');
 
     coreSiteObj.forEach(function (_coreSiteObj) {
-      if (isGLUSTERFSSelected && _coreSiteObj.name == "fs.default.name") {
-        coreSiteProperties[_coreSiteObj.name] =
-          this.get('configs').someProperty('name', 'fs_glusterfs_default_name') ?
-            this.get('configs').findProperty('name', 'fs_glusterfs_default_name').value :
null;
-      }
-      if (isGLUSTERFSSelected && _coreSiteObj.name == "fs.defaultFS") {
-        coreSiteProperties[_coreSiteObj.name] =
-          this.get('configs').someProperty('name', 'glusterfs_defaultFS_name') ?
-            this.get('configs').findProperty('name', 'glusterfs_defaultFS_name').value :
null;
+      if (coreSiteObj.isRequiredByAgent !== false) {
+        if (isGLUSTERFSSelected && _coreSiteObj.name == "fs.default.name") {
+          coreSiteProperties[_coreSiteObj.name] =
+            this.get('configs').someProperty('name', 'fs_glusterfs_default_name') ?
+              this.get('configs').findProperty('name', 'fs_glusterfs_default_name').value
: null;
+        }
+        if (isGLUSTERFSSelected && _coreSiteObj.name == "fs.defaultFS") {
+          coreSiteProperties[_coreSiteObj.name] =
+            this.get('configs').someProperty('name', 'glusterfs_defaultFS_name') ?
+              this.get('configs').findProperty('name', 'glusterfs_defaultFS_name').value
: null;
+        }
       }
     }, this);
     var attributes = App.router.get('mainServiceInfoConfigsController').getConfigAttributes(coreSiteObj);
@@ -1621,10 +1623,12 @@ App.WizardStep8Controller = Em.Controller.extend(App.AddSecurityConfigs,
App.wiz
     var configs = this.get('configs').filterProperty('filename', 'storm-site.xml');
     var stormProperties = {};
     configs.forEach(function (_configProperty) {
-      if (["nimbus.seeds", "storm.zookeeper.servers"].contains(_configProperty.name)) {
-        stormProperties[_configProperty.name] = JSON.stringify(_configProperty.value).replace(/"/g,
"'");
-      } else {
-        stormProperties[_configProperty.name] = _configProperty.value;
+      if (_configProperty.isRequiredByAgent !== false) {
+        if (["nimbus.seeds", "storm.zookeeper.servers"].contains(_configProperty.name)) {
+          stormProperties[_configProperty.name] = JSON.stringify(_configProperty.value).replace(/"/g,
"'");
+        } else {
+          stormProperties[_configProperty.name] = _configProperty.value;
+        }
       }
     }, this);
     return {type: 'storm-site', tag: tag, properties: stormProperties};


Mime
View raw message