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 2013/03/20 02:02:10 UTC
svn commit: r1458599 - in /incubator/ambari/trunk: ./ ambari-web/app/
ambari-web/app/controllers/main/admin/
ambari-web/app/controllers/main/admin/security/add/ ambari-web/app/data/
ambari-web/app/templates/main/admin/ ambari-web/app/templates/main/adm...
Author: jaimin
Date: Wed Mar 20 01:02:10 2013
New Revision: 1458599
URL: http://svn.apache.org/r1458599
Log:
AMBARI-1669. Security Wizard UI tweaks. (jaimin)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-web/app/controllers/main/admin/security.js
incubator/ambari/trunk/ambari-web/app/controllers/main/admin/security/add/step2.js
incubator/ambari/trunk/ambari-web/app/data/secure_configs.js
incubator/ambari/trunk/ambari-web/app/data/secure_properties.js
incubator/ambari/trunk/ambari-web/app/messages.js
incubator/ambari/trunk/ambari-web/app/templates/main/admin/security.hbs
incubator/ambari/trunk/ambari-web/app/templates/main/admin/security/add/menu.hbs
Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1458599&r1=1458598&r2=1458599&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Wed Mar 20 01:02:10 2013
@@ -145,6 +145,8 @@ Trunk (unreleased changes):
IMPROVEMENTS
+ AMBARI-1669. Security Wizard UI tweaks. (jaimin)
+
AMBARI-1630. Expose HUE config parameters through Ambari Web. (yusaku)
AMBARI-1595. Add Oracle option for Hive Metastore during Ambari
Modified: incubator/ambari/trunk/ambari-web/app/controllers/main/admin/security.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/main/admin/security.js?rev=1458599&r1=1458598&r2=1458599&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/controllers/main/admin/security.js (original)
+++ incubator/ambari/trunk/ambari-web/app/controllers/main/admin/security.js Wed Mar 20 01:02:10 2013
@@ -47,23 +47,6 @@ App.MainAdminSecurityController = Em.Con
})
});
}
- },
-
- notifySecurityAddPopup: function () {
- var self = this;
-
- App.ModalPopup.show({
- header: Em.I18n.t('admin.security.enable.popup.header'),
- primary: 'OK',
- secondary: null,
- onPrimary: function () {
- App.router.send('addSecurity');
- this.hide();
- },
- bodyClass: Ember.View.extend({
- template: Ember.Handlebars.compile('<h5>{{t admin.security.enable.popup.body}}</h5>')
- })
- });
}
});
Modified: incubator/ambari/trunk/ambari-web/app/controllers/main/admin/security/add/step2.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/main/admin/security/add/step2.js?rev=1458599&r1=1458598&r2=1458599&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/controllers/main/admin/security/add/step2.js (original)
+++ incubator/ambari/trunk/ambari-web/app/controllers/main/admin/security/add/step2.js Wed Mar 20 01:02:10 2013
@@ -64,7 +64,6 @@ App.MainAdminSecurityAddStep2Controller
}
//
this.set('installedServices', App.Service.find().mapProperty('serviceName'));
- this.set('selectedService', 'HDFS');
console.log("The services are: " + this.get('installedServices'));
//
},
@@ -81,12 +80,9 @@ App.MainAdminSecurityAddStep2Controller
serviceName: _serviceConfig.serviceName,
displayName: _serviceConfig.displayName,
configCategories: _serviceConfig.configCategories,
- showConfig: false,
+ showConfig: true,
configs: []
});
- if (this.get('content.services').mapProperty('serviceName').contains(_serviceConfig.serviceName)) {
- serviceConfig.set('showConfig', true);
- }
this.loadComponentConfigs(_serviceConfig, serviceConfig);
Modified: incubator/ambari/trunk/ambari-web/app/data/secure_configs.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/data/secure_configs.js?rev=1458599&r1=1458598&r2=1458599&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/data/secure_configs.js (original)
+++ incubator/ambari/trunk/ambari-web/app/data/secure_configs.js Wed Mar 20 01:02:10 2013
@@ -26,10 +26,10 @@ var configProperties = App.SecureConfigP
module.exports = [
{
serviceName: 'GENERAL',
- displayName: 'CLUSTER',
+ displayName: 'Kerberos',
filename: 'hdfs-site',
configCategories: [
- App.ServiceConfigCategory.create({ name: 'KERBEROS', displayName: 'KERBEROS'})
+ App.ServiceConfigCategory.create({ name: 'KERBEROS', displayName: 'General'})
],
configs: configProperties.filterProperty('serviceName', 'GENERAL')
},
Modified: incubator/ambari/trunk/ambari-web/app/data/secure_properties.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/data/secure_properties.js?rev=1458599&r1=1458598&r2=1458599&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/data/secure_properties.js (original)
+++ incubator/ambari/trunk/ambari-web/app/data/secure_properties.js Wed Mar 20 01:02:10 2013
@@ -26,6 +26,7 @@ module.exports =
"defaultValue": "true",
"description": "Enable kerberos security for the cluster",
"isVisible": false,
+ "isOverrideable": false,
"serviceName": "GENERAL",
"category": "KERBEROS"
},
@@ -38,6 +39,7 @@ module.exports =
"description": "Path to installed kinit command",
"displayType": "principal",
"isVisible": false,
+ "isOverrideable": false,
"serviceName": "GENERAL",
"category": "KERBEROS"
},
@@ -49,6 +51,7 @@ module.exports =
"defaultValue": "MANUALLY_SET_KERBEROS",
"description": "Type of kerberos security for the cluster",
"isVisible": false,
+ "isOverrideable": false,
"serviceName": "GENERAL",
"category": "KERBEROS"
},
@@ -61,6 +64,7 @@ module.exports =
"description": "Type of kerberos security for the cluster",
"displayType": "principal",
"isVisible": false,
+ "isOverrideable": false,
"serviceName": "GENERAL",
"category": "KERBEROS"
},
@@ -73,6 +77,7 @@ module.exports =
"description": "Realm name to be used for all principal names",
"displayType": "principal",
"isVisible": true,
+ "isOverrideable": false,
"serviceName": "GENERAL",
"category": "KERBEROS"
},
@@ -85,6 +90,7 @@ module.exports =
"description": "Whether to use instance name for creating principals across cluster",
"displayType": "checkbox",
"isVisible": true,
+ "isOverrideable": false,
"serviceName": "GENERAL",
"category": "KERBEROS"
},
@@ -93,12 +99,13 @@ module.exports =
{
"id": "puppet var",
"name": "namenode_primary_name",
- "displayName": "primary name",
+ "displayName": "Primary name",
"value": "",
"defaultValue": "nn",
"description": "Primary name for NameNode",
"displayType": "principal",
"isVisible": true,
+ "isOverrideable": false,
"serviceName": "HDFS",
"category": "NameNode"
},
@@ -111,19 +118,21 @@ module.exports =
"description": "Keytab for NameNode",
"displayType": "directory",
"isVisible": true,
+ "isOverrideable": false,
"serviceName": "HDFS",
"category": "NameNode"
},
{
"id": "puppet var",
"name": "hadoop_http_primary_name",
- "displayName": "HTTP primary name",
+ "displayName": "HTTP Primary name",
"value": "",
"defaultValue": "HTTP",
"isReconfigurable": false,
"description": "Primary name for spnego access for NameNode",
"displayType": "principal",
"isVisible": true,
+ "isOverrideable": false,
"serviceName": "HDFS",
"category": "General"
},
@@ -136,6 +145,7 @@ module.exports =
"description": "Keytab for http NameNode and SNameNode",
"displayType": "directory",
"isVisible": true,
+ "isOverrideable": false,
"serviceName": "HDFS",
"category": "General"
},
@@ -143,7 +153,7 @@ module.exports =
{
"id": "puppet var",
"name": "snamenode_primary_name",
- "displayName": "primary name",
+ "displayName": "Primary name",
"value": "",
"defaultValue": "sn",
"description": "Primary name for SecondaryNameNode",
@@ -162,18 +172,20 @@ module.exports =
"description": "path to SecondaryNameNode keytab file",
"displayType": "directory",
"isVisible": true,
+ "isOverrideable": false,
"serviceName": "HDFS",
"category": "SNameNode"
},
{
"id": "puppet var",
"name": "datanode_primary_name",
- "displayName": "primary name",
+ "displayName": "Primary name",
"value": "",
"defaultValue": "dn",
"description": "Primary name for DataNode",
"displayType": "principal",
"isVisible": true,
+ "isOverrideable": false,
"serviceName": "HDFS",
"category": "DataNode"
},
@@ -186,6 +198,7 @@ module.exports =
"description": "Path to DataNode keytab file",
"displayType": "directory",
"isVisible": true,
+ "isOverrideable": false,
"serviceName": "HDFS",
"category": "DataNode"
},
@@ -193,12 +206,13 @@ module.exports =
{
"id": "puppet var",
"name": "jobtracker_primary_name",
- "displayName": "primary name",
+ "displayName": "Primary name",
"value": "",
"defaultValue": "jt",
"description": "Primary name for JobTracker",
"displayType": "principal",
"isVisible": true,
+ "isOverrideable": false,
"serviceName": "MAPREDUCE",
"category": "JobTracker"
},
@@ -211,18 +225,20 @@ module.exports =
"description": "Path to JobTracker keytab file",
"displayType": "directory",
"isVisible": true,
+ "isOverrideable": false,
"serviceName": "MAPREDUCE",
"category": "JobTracker"
},
{
"id": "puppet var",
"name": "tasktracker_primary_name",
- "displayName": "primary name",
+ "displayName": "Primary name",
"value": "",
"defaultValue": "tt",
"description": "Primary name for TaskTracker",
"displayType": "principal",
"isVisible": true,
+ "isOverrideable": false,
"serviceName": "MAPREDUCE",
"category": "TaskTracker"
},
@@ -235,6 +251,7 @@ module.exports =
"description": "keytab for TaskTracker",
"displayType": "directory",
"isVisible": true,
+ "isOverrideable": false,
"serviceName": "MAPREDUCE",
"category": "TaskTracker"
},
@@ -243,12 +260,13 @@ module.exports =
{
"id": "puppet var",
"name": "hbase_master_primary_name",
- "displayName": "primary name",
+ "displayName": "Primary name",
"value": "",
"defaultValue": "hm",
"description": "Primary name for HBase master",
"displayType": "principal",
"isVisible": true,
+ "isOverrideable": false,
"serviceName": "HBASE",
"category": "HBase Master"
},
@@ -261,18 +279,20 @@ module.exports =
"description": "keytab for HBase master",
"displayType": "directory",
"isVisible": true,
+ "isOverrideable": false,
"serviceName": "HBASE",
"category": "HBase Master"
},
{
"id": "puppet var",
"name": "regionserver_primary_name",
- "displayName": "primary name",
+ "displayName": "Primary name",
"value": "",
"defaultValue": "rs",
"description": "Primary name for regionServer",
"displayType": "principal",
"isVisible": true,
+ "isOverrideable": false,
"serviceName": "HBASE",
"category": "RegionServer"
},
@@ -285,6 +305,7 @@ module.exports =
"description": "keytab for RegionServer",
"displayType": "directory",
"isVisible": true,
+ "isOverrideable": false,
"serviceName": "HBASE",
"category": "RegionServer"
},
@@ -293,12 +314,13 @@ module.exports =
{
"id": "puppet var",
"name": "hive_metastore_primary_name",
- "displayName": "primary name",
+ "displayName": "Primary name",
"value": "",
"defaultValue": "hive",
"description": "Primary name for Hive Metastore",
"displayType": "principal",
"isVisible": true,
+ "isOverrideable": false,
"serviceName": "HIVE",
"category": "Hive Metastore"
},
@@ -311,6 +333,7 @@ module.exports =
"description": "keytab for Hive Metastore",
"displayType": "directory",
"isVisible": true,
+ "isOverrideable": false,
"serviceName": "HIVE",
"category": "Hive Metastore"
@@ -326,18 +349,20 @@ module.exports =
"description": "Oozie server host",
"displayType": "masterHosts",
"isVisible": false,
+ "isOverrideable": false,
"serviceName": "OOZIE",
"category": "Oozie Server"
},
{
"id": "puppet var",
"name": "oozie_primary_name",
- "displayName": "primary name",
+ "displayName": "Primary name",
"value": "",
"defaultValue": "oozie",
"description": "Primary name for Oozie server",
"displayType": "principal",
"isVisible": true,
+ "isOverrideable": false,
"serviceName": "OOZIE",
"category": "Oozie Server"
},
@@ -350,19 +375,21 @@ module.exports =
"description": "Keytab for Oozie server",
"displayType": "directory",
"isVisible": true,
+ "isOverrideable": false,
"serviceName": "OOZIE",
"category": "Oozie Server"
},
{
"id": "puppet var",
"name": "oozie_http_primary_name",
- "displayName": "HTTP primary name",
+ "displayName": "HTTP Primary name",
"value": "",
"defaultValue": "HTTP",
"description": "Primary name for spnego access for Oozie server",
"isReconfigurable": false,
"displayType": "principal",
"isVisible": true,
+ "isOverrideable": false,
"serviceName": "OOZIE",
"category": "Oozie Server"
},
@@ -375,6 +402,7 @@ module.exports =
"description": "Keytab for http Oozie server",
"displayType": "directory",
"isVisible": true,
+ "isOverrideable": false,
"serviceName": "OOZIE",
"category": "Oozie Server"
},
@@ -384,13 +412,14 @@ module.exports =
{
"id": "puppet var",
"name": "webhcat_http_primary_name",
- "displayName": "HTTP primary name",
+ "displayName": "HTTP Primary name",
"value": "",
"defaultValue": "HTTP",
"description": "Primary name for spnego access for webHCat",
"displayType": "principal",
"isReconfigurable": false,
"isVisible": true,
+ "isOverrideable": false,
"serviceName": "WEBHCAT",
"category": "WebHCat"
},
@@ -403,6 +432,7 @@ module.exports =
"description": "Keytab for http webHCat",
"displayType": "directory",
"isVisible": true,
+ "isOverrideable": false,
"serviceName": "WEBHCAT",
"category": "WebHCat"
},
@@ -419,18 +449,20 @@ module.exports =
"description": "Nagios server host",
"displayType": "masterHosts",
"isVisible": true,
+ "isOverrideable": false,
"serviceName": "NAGIOS",
"category": "General"
},
{
"id": "puppet var",
"name": "nagios_primary_name",
- "displayName": "primary name",
+ "displayName": "Primary name",
"value": "",
"defaultValue": "nagios",
"description": "Primary name for Nagios server",
"displayType": "principal",
"isVisible": true,
+ "isOverrideable": false,
"serviceName": "NAGIOS",
"category": "General"
},
@@ -443,6 +475,7 @@ module.exports =
"description": "Keytab for nagios",
"displayType": "directory",
"isVisible": true,
+ "isOverrideable": false,
"serviceName": "NAGIOS",
"category": "General"
}
Modified: incubator/ambari/trunk/ambari-web/app/messages.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/messages.js?rev=1458599&r1=1458598&r2=1458599&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/messages.js (original)
+++ incubator/ambari/trunk/ambari-web/app/messages.js Wed Mar 20 01:02:10 2013
@@ -511,7 +511,6 @@ Em.I18n.translations = {
'admin.security.enable.popup.header': 'Add security',
'admin.security.disable.popup.header': 'Remove security',
'admin.security.disable.popup.body': 'Kerberos security will be disabled on the cluster',
- 'admin.security.recommend.enable': 'Enabling security is highly recommended',
'admin.addSecurity.header': 'Add security wizard',
'admin.security.step1.header': 'Start',
'admin.security.step2.header': 'Configure',
Modified: incubator/ambari/trunk/ambari-web/app/templates/main/admin/security.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/templates/main/admin/security.hbs?rev=1458599&r1=1458598&r2=1458599&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/templates/main/admin/security.hbs (original)
+++ incubator/ambari/trunk/ambari-web/app/templates/main/admin/security.hbs Wed Mar 20 01:02:10 2013
@@ -31,10 +31,8 @@
<div>
<p class="text-error">{{t admin.security.disabled}}
<a
- class="btn btn-padding btn-success" {{action notifySecurityAddPopup target="controller"}}>{{t admin.security.button.enable}}
+ class="btn btn-padding btn-success" {{action addSecurity}}>{{t admin.security.button.enable}}
</a> <br/>
</p>
-
- <p class="alert alert-info">{{t admin.security.recommend.enable}}</p>
</div>
{{/if}}
\ No newline at end of file
Modified: incubator/ambari/trunk/ambari-web/app/templates/main/admin/security/add/menu.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/templates/main/admin/security/add/menu.hbs?rev=1458599&r1=1458598&r2=1458599&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/templates/main/admin/security/add/menu.hbs (original)
+++ incubator/ambari/trunk/ambari-web/app/templates/main/admin/security/add/menu.hbs Wed Mar 20 01:02:10 2013
@@ -17,7 +17,7 @@
}}
-<div id="addSecurity">
+<div class="wizard">
<div class="container">
<div class="container-fluid">
<div class="row-fluid">
@@ -32,7 +32,7 @@
</ul>
</div>
</div>
- <div id="addSecurity-content" class="well span9">
+ <div class="wizard-content well span9">
{{outlet}}
</div>
</div>