Author: srimanth
Date: Fri May 24 01:20:04 2013
New Revision: 1485915
URL: http://svn.apache.org/r1485915
Log:
AMBARI-2196. Install Wizard, Customize Services changes. (srimanth)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-web/app/controllers/wizard/step8_controller.js
incubator/ambari/trunk/ambari-web/app/data/config_properties.js
incubator/ambari/trunk/ambari-web/app/models/service_config.js
Modified: incubator/ambari/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1485915&r1=1485914&r2=1485915&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Fri May 24 01:20:04 2013
@@ -895,6 +895,8 @@ Trunk (unreleased changes):
BUG FIXES
+ AMBARI-2196. Install Wizard, Customize Services changes. (srimanth)
+
AMBARI-2193. Remove zookeeper dependency for HIVE and HCAT. (srimanth)
AMBARI-2184. Install progress gets stuck at 33% and displays incorrect
Modified:
incubator/ambari/trunk/ambari-web/app/controllers/wizard/step8_controller.js
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/wizard/step8_controller.js?rev=1485915&r1=1485914&r2=1485915&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-web/app/controllers/wizard/step8_controller.js
(original)
+++
incubator/ambari/trunk/ambari-web/app/controllers/wizard/step8_controller.js
Fri May 24 01:20:04 2013
@@ -34,10 +34,10 @@ App.WizardStep8Controller = Em.Controlle
servicesInstalled: false,
/**
* During page save time, we set the host overrides to the server.
- * The new host -> site:tag map is stored below. This will be
+ * The new host -> site:tag map is stored below. This will be
* useful during save, to update the host's host components. Also,
* it will be useful in deletion of overrides.
- *
+ *
* Example:
* {
* 'hostname1': {
@@ -49,7 +49,7 @@ App.WizardStep8Controller = Em.Controlle
* }
* }
* }
- *
+ *
* @see loadedHostToOverrideSiteToTagMap
*/
savedHostToOverrideSiteToTagMap: {},
@@ -131,7 +131,7 @@ App.WizardStep8Controller = Em.Controlle
globals = globals.without(globals.findProperty('name',
'oozie_existing_mysql_database'));
globals = globals.without(globals.findProperty('name',
'oozie_existing_oracle_host'));
globals = globals.without(globals.findProperty('name',
'oozie_existing_oracle_database'));
- }else if (oozieDb.value === 'New MySQL Database') {
+ }/*else if (oozieDb.value === 'New MySQL Database') {
if (globals.someProperty('name', 'oozie_ambari_host')) {
globals.findProperty('name', 'oozie_ambari_host').name =
'oozie_hostname';
oozieDbType.value = 'mysql';
@@ -143,7 +143,7 @@ App.WizardStep8Controller = Em.Controlle
globals = globals.without(globals.findProperty('name',
'oozie_existing_oracle_host'));
globals = globals.without(globals.findProperty('name',
'oozie_existing_oracle_database'));
globals = globals.without(globals.findProperty('name',
'oozie_derby_database'));
- } else if (oozieDb.value === 'Existing MySQL Database'){
+ } */ else if (oozieDb.value === 'Existing MySQL Database') {
globals.findProperty('name', 'oozie_existing_mysql_host').name =
'oozie_hostname';
oozieDbType.value = 'mysql';
oozieJdbcDriver.value = 'com.mysql.jdbc.Driver';
@@ -275,7 +275,7 @@ App.WizardStep8Controller = Em.Controlle
value = null;
}
}, this);
-
+
var valueWithOverrides = {
value: value,
overrides: []
@@ -298,7 +298,7 @@ App.WizardStep8Controller = Em.Controlle
}
return valueWithOverrides;
},
-
+
_replaceConfigValues: function (name, express, value, globValue) {
if (name === "templeton.zookeeper.hosts" || name ===
'hbase.zookeeper.quorum') {
// globValue is an array of ZooKeeper Server hosts
@@ -316,7 +316,7 @@ App.WizardStep8Controller = Em.Controlle
}
return value;
},
-
+
/**
* Set all site property that are derived from other site-properties
*/
@@ -799,9 +799,9 @@ App.WizardStep8Controller = Em.Controlle
if (oozieDb.value === 'New Derby Database'){
var db = App.db.getServiceConfigProperties().findProperty('name',
'oozie_derby_database');
dbComponent.set('component_value', db.value + ' (' + oozieDb.value +
')');
- } else if (oozieDb.value === 'New MySQL Database') {
+ }/* else if (oozieDb.value === 'New MySQL Database') {
dbComponent.set('component_value', 'MySQL (New Database)');
- } else if(oozieDb.value === 'Existing MySQL Database'){
+ } */else if(oozieDb.value === 'Existing MySQL Database'){
var db = App.db.getServiceConfigProperties().findProperty('name',
'oozie_existing_mysql_database');
dbComponent.set('component_value', db.value + ' (' + oozieDb.value +
')');
} else { // existing oracle database
@@ -1521,10 +1521,10 @@ App.WizardStep8Controller = Em.Controlle
if (oozieDb.value === 'New Derby Database'){
oozieProperties["oozie.service.JPAService.jdbc.url"] =
"jdbc:derby:${oozie.data.dir}/${oozie.db.schema.name}-db;create=true";
oozieProperties["oozie.service.JPAService.jdbc.driver"] =
"org.apache.derby.jdbc.EmbeddedDriver";
- }else if (oozieDb.value === 'New MySQL Database') {
+ }/*else if (oozieDb.value === 'New MySQL Database') {
oozieProperties["oozie.service.JPAService.jdbc.url"] = "jdbc:mysql://"
+ oozieHost + "/" + oozieDbName;
oozieProperties["oozie.service.JPAService.jdbc.driver"] =
"com.mysql.jdbc.Driver";
- } else if (oozieDb.value === 'Existing MySQL Database'){
+ } */ else if (oozieDb.value === 'Existing MySQL Database') {
oozieProperties["oozie.service.JPAService.jdbc.url"] = "jdbc:mysql://"
+ oozieHost + "/" + oozieDbName;
oozieProperties["oozie.service.JPAService.jdbc.driver"] =
"com.mysql.jdbc.Driver";
} else { //existing oracle database
@@ -1652,7 +1652,7 @@ App.WizardStep8Controller = Em.Controlle
/**
* Creates host level overrides for service configuration.
- *
+ *
*/
createHostOverrideConfigurations: function () {
var singlePUTHostData = [];
@@ -1697,7 +1697,7 @@ App.WizardStep8Controller = Em.Controlle
* We need to do a lot of ajax calls async in special order. To do this,
* generate array of ajax objects and then send requests step by step. All
* ajax objects are stored in <code>ajaxQueue</code>
- *
+ *
* @param params
*/
Modified: incubator/ambari/trunk/ambari-web/app/data/config_properties.js
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/data/config_properties.js?rev=1485915&r1=1485914&r2=1485915&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/data/config_properties.js (original)
+++ incubator/ambari/trunk/ambari-web/app/data/config_properties.js Fri May 24
01:20:04 2013
@@ -1687,7 +1687,7 @@ module.exports =
"index": 1
},
// for new MySQL
- {
+ /*{
"id": "puppet var",
"name": "oozie_ambari_database",
"displayName": "Database Type",
@@ -1701,7 +1701,7 @@ module.exports =
"serviceName": "OOZIE",
"category": "Oozie Server",
"index": 1
- },
+ },*/
// for current derby
{
"id": "puppet var",
@@ -1745,13 +1745,13 @@ module.exports =
"options": [
{
displayName: 'New Derby Database',
- foreignKeys: ['oozie_derby_database']
+ foreignKeys: ['oozie_derby_database','oozie_ambari_host']
},
- {
+ /*{
displayName: 'New MySQL Database',
foreignKeys: ['oozie_ambari_database', 'oozie_ambari_host'],
hidden: !App.supports.hiveOozieExtraDatabases
- },
+ },*/
{
displayName: 'Existing MySQL Database',
foreignKeys: ['oozie_existing_mysql_database',
'oozie_existing_mysql_host'],
@@ -1774,111 +1774,115 @@ module.exports =
"category": "Oozie Server",
"index": 2
},
- {
- "id": "puppet var",
- "name": "oozie_database_name",
- "displayName": "Database Name",
- "description": "Database name used for the Oozie",
- "defaultValue": "oozie",
- "isReconfigurable": false,
- "isOverridable": false,
- "displayType": "host",
- "isVisible": true,
- //"domain": "global",
- "serviceName": "OOZIE",
- "category": "Oozie Server",
- "index": 3
- },
- {
- "id": "puppet var",
- "name": "oozie_metastore_user_name",
- "displayName": "Database Username",
- "description": "Database user name to use to connect to the database",
- "defaultValue": "oozie",
- "isReconfigurable": false,
- "isOverridable": false,
- "displayType": "user",
- "isVisible": true,
- //"domain": "global",
- "serviceName": "OOZIE",
- "category": "Oozie Server",
- "index": 4
- },
- {
- "id": "puppet var",
- "name": "oozie_metastore_user_passwd",
- "displayName": "Database Password",
- "description": "Database password to use to connect to the database",
- "defaultValue": "",
- "isReconfigurable": false,
- "isOverridable": false,
- "displayType": "password",
- "isVisible": true,
- //"domain": "global",
- "serviceName": "OOZIE",
- "category": "Oozie Server",
- "index": 5
- },
- {
- "id": "puppet var",
- "name": "oozie_data_dir",
- "displayName": "Oozie Data Dir",
- "description": "Data directory in which the Oozie DB exists",
- "defaultValue": "",
- "defaultDirectory": "/hadoop/oozie/data",
- "isReconfigurable": false,
- "displayType": "directory",
- "isOverridable": false,
- "isVisible": true,
- "isRequired": false,
- "domain": "global",
- "serviceName": "OOZIE",
- "category": "Oozie Server",
- "index": 6
- },
- {
- "id": "puppet var",
- "name": "oozie_existing_mysql_host",
- "displayName": "Database Host",
- "description": "Specify the host on which the existing database is
hosted",
- "defaultValue": "",
- "isReconfigurable": false,
- "isOverridable": false,
- "displayType": "host",
- "isVisible": false,
- //"domain": "global",
- "serviceName": "OOZIE",
- "category": "Oozie Server"
- },
- {
- "id": "puppet var",
- "name": "oozie_existing_oracle_host",
- "displayName": "Database Host",
- "description": "Specify the host on which the existing database is
hosted",
- "defaultValue": "",
- "isReconfigurable": false,
- "isOverridable": false,
- "displayType": "host",
- "isVisible": false,
- //"domain": "global",
- "serviceName": "OOZIE",
- "category": "Oozie Server"
- },
- {
- "id": "puppet var",
- "name": "oozie_ambari_host",
- "value": "",
- "defaultValue": "",
- "displayName": "Database Host",
- "description": "Host on which the database will be created by Ambari",
- "isReconfigurable": false,
- "isOverridable": false,
- "displayType": "masterHost",
- "isVisible": false,
- //"domain": "global",
- "serviceName": "OOZIE",
- "category": "Oozie Server"
- },
+ {
+ "id": "puppet var",
+ "name": "oozie_existing_mysql_host",
+ "displayName": "Database Host",
+ "description": "Specify the host on which the existing database is
hosted",
+ "defaultValue": "",
+ "isReconfigurable": false,
+ "isOverridable": false,
+ "displayType": "host",
+ "isVisible": false,
+ "domain": "global",
+ "serviceName": "OOZIE",
+ "category": "Oozie Server",
+ "index": 3
+ },
+ {
+ "id": "puppet var",
+ "name": "oozie_existing_oracle_host",
+ "displayName": "Database Host",
+ "description": "Specify the host on which the existing database is
hosted",
+ "defaultValue": "",
+ "isReconfigurable": false,
+ "isOverridable": false,
+ "displayType": "host",
+ "isVisible": false,
+ "domain": "global",
+ "serviceName": "OOZIE",
+ "category": "Oozie Server",
+ "index": 3
+ },
+ {
+ "id": "puppet var",
+ "name": "oozie_ambari_host",
+ "value": "",
+ "defaultValue": "",
+ "displayName": "Database Host",
+ "description": "Host on which the database will be created by
Ambari",
+ "isReconfigurable": false,
+ "isOverridable": false,
+ "displayType": "masterHost",
+ "isVisible": false,
+ "domain": "global",
+ "serviceName": "OOZIE",
+ "category": "Oozie Server",
+ "index": 3
+ },
+ {
+ "id": "puppet var",
+ "name": "oozie_database_name",
+ "displayName": "Database Name",
+ "description": "Database name used for the Oozie",
+ "defaultValue": "oozie",
+ "isReconfigurable": false,
+ "isOverridable": false,
+ "displayType": "host",
+ "isVisible": true,
+ //"domain": "global",
+ "serviceName": "OOZIE",
+ "category": "Oozie Server",
+ "index": 4
+ },
+ {
+ "id": "puppet var",
+ "name": "oozie_metastore_user_name",
+ "displayName": "Database Username",
+ "description": "Database user name to use to connect to the
database",
+ "defaultValue": "oozie",
+ "isReconfigurable": false,
+ "isOverridable": false,
+ "displayType": "user",
+ "isVisible": true,
+ //"domain": "global",
+ "serviceName": "OOZIE",
+ "category": "Oozie Server",
+ "index": 5
+ },
+ {
+ "id": "puppet var",
+ "name": "oozie_metastore_user_passwd",
+ "displayName": "Database Password",
+ "description": "Database password to use to connect to the database",
+ "defaultValue": "",
+ "isReconfigurable": false,
+ "isOverridable": false,
+ "displayType": "password",
+ "isVisible": true,
+ //"domain": "global",
+ "serviceName": "OOZIE",
+ "category": "Oozie Server",
+ "index": 6
+ },
+ {
+ "id": "puppet var",
+ "name": "oozie_data_dir",
+ "displayName": "Oozie Data Dir",
+ "description": "Data directory in which the Oozie DB exists",
+ "defaultValue": "",
+ "defaultDirectory": "/hadoop/oozie/data",
+ "isReconfigurable": false,
+ "displayType": "directory",
+ "isOverridable": false,
+ "isVisible": true,
+ "isRequired": false,
+ "domain": "global",
+ "serviceName": "OOZIE",
+ "category": "Oozie Server",
+ "index": 7
+ },
+
{
"id": "puppet var",
"name": "oozie_log_dir",
Modified: incubator/ambari/trunk/ambari-web/app/models/service_config.js
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/models/service_config.js?rev=1485915&r1=1485914&r2=1485915&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/models/service_config.js (original)
+++ incubator/ambari/trunk/ambari-web/app/models/service_config.js Fri May 24
01:20:04 2013
@@ -215,7 +215,7 @@ App.ServiceConfigProperty = Ember.Object
* Don't show "Undo" for hosts on Installer Step7
*/
cantBeUndone: function() {
- var types = ["masterHost", "slaveHosts", "masterHosts", "slaveHost"];
+ var types = ["masterHost", "slaveHosts", "masterHosts", "slaveHost","radio
button"];
var displayType = this.get('displayType');
var result = false;
types.forEach(function(type) {
