Browse Source

AMBARI-6128 Security Wizard: Create principals and keytabs page. Table render optimization.(Buzhor Denys via ababiichuk)

aBabiichuk 11 years ago
parent
commit
c11bcf5538

+ 2 - 2
ambari-web/app/messages.js

@@ -984,8 +984,8 @@ Em.I18n.translations = {
   'admin.security.step1.body.instruction4': 'Generate keytabs for each principal and place on the appropriate hosts',
   'admin.security.step1.body.instruction5': '<b>Application Timeline Server</b> component of YARN service will be <span class="text-error"><b>deleted</b></span> as part of enabling security',
   'admin.security.step2.body.header': 'Configure Kerberos security properties',
-  'admin.security.step3.notice': 'You need to create the following principals and keytabs on the hosts shown.<br />'+
-  'You can download the list as a CSV file and use it to create a script to generate the principals and keytabs. ' +
+  'admin.security.step3.notice': 'You need to create Kerberos principals and keytabs before proceeding.<br />'+
+  'Download the CSV file and use it to create a script to generate the principals and keytabs on specified hosts. ' +
   'Once the principals and keytabs have been created, click on <i>Apply</i> to continue. If you need to make configuration changes, click <i>Back</i>.',
   'admin.security.step3.table.principal': 'Principal',
   'admin.security.step3.table.keytab': 'Keytab',

+ 6 - 29
ambari-web/app/templates/main/admin/security/add/step3.hbs

@@ -19,36 +19,13 @@
 <h2>{{t admin.security.step3.header}}</h2>
 <div class="alert alert-info">{{t admin.security.step3.notice}}</div>
 {{#if isLoaded}}
-    <div class="step3">
-        <table class="table table-bordered table-striped">
-            <thead>
-            <tr>
-                <th>{{t common.host}}</th>
-                <th>{{t common.component}}</th>
-                <th>{{t admin.security.step3.table.principal}}</th>
-                <th>{{t admin.security.step3.table.keytab}}</th>
-            </tr>
-            </thead>
-            <tbody>
-            {{#each hostComponent in hostComponents}}
-                <tr>
-                    <td>{{hostComponent.host}}</td>
-                    <td>{{hostComponent.component}}</td>
-                    <td>{{hostComponent.principal}}</td>
-                    <td>{{hostComponent.keytab}}</td>
-                </tr>
-            {{/each}}
-            </tbody>
-        </table>
-    </div>
-    <div class="btn-area">
-        <a class="btn" {{action back}}>&larr; {{t common.back}}</a>
-
-        <div class="pull-right">
-            <button class="btn btn-info" {{action doDownloadCsv target="controller"}}>{{t admin.security.step3.downloadCSV}}</button>
-            <button class="btn btn-success" {{bindAttr disabled="isSubmitDisabled"}} {{action next}}>{{t common.apply}} &rarr;</button>
-        </div>
+  <div class="btn-area">
+    <a class="btn" {{action back}}>&larr; {{t common.back}}</a>
+    <div class="pull-right">
+      <button class="btn btn-info" {{action doDownloadCsv target="controller"}}>{{t admin.security.step3.downloadCSV}}</button>
+      <button class="btn btn-success" {{bindAttr disabled="isSubmitDisabled"}} {{action next}}>{{t common.apply}} &rarr;</button>
     </div>
+  </div>
 {{else}}
     <div class="spinner"></div>
 {{/if}}