You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by on...@apache.org on 2013/12/27 15:05:59 UTC
git commit: AMBARI-4186. Global configs are not sent to server.
(onechiporenko)
Updated Branches:
refs/heads/trunk ef6d3af8d -> 37d59a55e
AMBARI-4186. Global configs are not sent to server. (onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/37d59a55
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/37d59a55
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/37d59a55
Branch: refs/heads/trunk
Commit: 37d59a55eb348e7ebc831522e75d56678eb7d012
Parents: ef6d3af
Author: Oleg Nechiporenko <on...@apache.org>
Authored: Fri Dec 27 14:44:02 2013 +0200
Committer: Oleg Nechiporenko <on...@apache.org>
Committed: Fri Dec 27 14:44:02 2013 +0200
----------------------------------------------------------------------
ambari-web/app/controllers/wizard/step8_controller.js | 9 +++++----
ambari-web/app/data/HDP2/global_properties.js | 13 -------------
ambari-web/app/data/global_properties.js | 13 -------------
3 files changed, 5 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/37d59a55/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 ac23c79..0299457 100644
--- a/ambari-web/app/controllers/wizard/step8_controller.js
+++ b/ambari-web/app/controllers/wizard/step8_controller.js
@@ -1395,11 +1395,15 @@ App.WizardStep8Controller = Em.Controller.extend({
createConfigurations: function () {
var selectedServices = this.get('selectedServices');
if (this.get('content.controllerName') == 'installerController') {
- this.get('serviceConfigTags').pushObject(this.createGlobalSiteObj());
this.get('serviceConfigTags').pushObject(this.createCoreSiteObj());
this.get('serviceConfigTags').pushObject(this.createHdfsSiteObj());
this.get('serviceConfigTags').pushObject(this.createLog4jObj('HDFS'));
}
+ var globalSiteObj = this.createGlobalSiteObj();
+ if (this.get('content.controllerName') == 'addServiceController') {
+ globalSiteObj.tag = 'version' + (new Date).getTime();
+ }
+ this.get('serviceConfigTags').pushObject(globalSiteObj);
if (selectedServices.someProperty('serviceName', 'MAPREDUCE')) {
this.get('serviceConfigTags').pushObject(this.createMrSiteObj());
if (App.supports.capacitySchedulerUi) {
@@ -1536,9 +1540,6 @@ App.WizardStep8Controller = Em.Controller.extend({
} else {
globalSiteProperties[_globalSiteObj.name] = App.config.escapeXMLCharacters(_globalSiteObj.value);
}
- if (_globalSiteObj.name == 'java64_home') {
- globalSiteProperties['java64_home'] = this.get('content.installOptions.javaHome');
- }
}
this._recordHostOverrideFromObj(_globalSiteObj, 'global', 'version1', this);
}, this);
http://git-wip-us.apache.org/repos/asf/ambari/blob/37d59a55/ambari-web/app/data/HDP2/global_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/global_properties.js b/ambari-web/app/data/HDP2/global_properties.js
index 56ad6c2..d174110 100644
--- a/ambari-web/app/data/HDP2/global_properties.js
+++ b/ambari-web/app/data/HDP2/global_properties.js
@@ -1311,19 +1311,6 @@ module.exports =
},
{
"id": "puppet var",
- "name": "java64_home",
- "displayName": "Path to 64-bit JAVA_HOME",
- "description": "Path to 64-bit JAVA_HOME. /usr/jdk/jdk1.6.0_31 is the default used by Ambari. You can override this to a specific path that contains the JDK. Note that the path must be valid on ALL hosts in your cluster.",
- "defaultValue": "/usr/jdk64/jdk1.6.0_31",
- "isRequired": true,
- "isReconfigurable": false,
- "displayType": "directory",
- "isVisible": false,
- "serviceName": "MISC",
- "belongsToService":[]
- },
- {
- "id": "puppet var",
"name": "hdfs_user",
"displayName": "HDFS User",
"description": "User to run HDFS as",
http://git-wip-us.apache.org/repos/asf/ambari/blob/37d59a55/ambari-web/app/data/global_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/global_properties.js b/ambari-web/app/data/global_properties.js
index 4bd3c42..957e831 100644
--- a/ambari-web/app/data/global_properties.js
+++ b/ambari-web/app/data/global_properties.js
@@ -1233,19 +1233,6 @@ module.exports =
},
{
"id": "puppet var",
- "name": "java64_home",
- "displayName": "Path to 64-bit JAVA_HOME",
- "description": "Path to 64-bit JAVA_HOME. /usr/jdk/jdk1.6.0_31 is the default used by Ambari. You can override this to a specific path that contains the JDK. Note that the path must be valid on ALL hosts in your cluster.",
- "defaultValue": "/usr/jdk64/jdk1.6.0_31",
- "isRequired": true,
- "isReconfigurable": false,
- "displayType": "directory",
- "isVisible": false,
- "serviceName": "MISC",
- "belongsToService": []
- },
- {
- "id": "puppet var",
"name": "hdfs_user",
"displayName": "HDFS User",
"description": "User to run HDFS as",