Update Review page for ceph cluster
Change-Id: I3baf60608cf664279f88b3906c61eb2a84d0332c
This commit is contained in:
jiahuay
parent
03f6c7610a
commit
9c42b60f75
|
|
@ -666,7 +666,7 @@ compassAppDev.run(function($httpBackend, settings, $http) {
|
|||
var cluster = {
|
||||
"id": parseInt(id),
|
||||
"name": "Cluster" + id,
|
||||
"adapter_id": 6,
|
||||
"adapter_id": 6, // 6: ceph_openstack_icehouse, 5: openstack_icehouse, 4: ceph(chef), 2: os_only
|
||||
"os_id": 1,
|
||||
"editable": true,
|
||||
"create_by": "user@someemail.com",
|
||||
|
|
|
|||
|
|
@ -149,12 +149,53 @@
|
|||
</div>
|
||||
<div class="space-16"></div>
|
||||
<div class="row">
|
||||
<div class="col-sm-6">
|
||||
<div class="widget-box transparent margin-top-minus10">
|
||||
<div class="widget-header widget-header-flat">
|
||||
<h4 class="widget-title lighter" ng-click="returnStep('os_global')">
|
||||
<i class="ace-icon fa fa-globe"></i>
|
||||
OS Global Configurations
|
||||
</h4>
|
||||
<div class="widget-toolbar">
|
||||
<a class="action" ng-click="isConfigCollapsed = !isConfigCollapsed">
|
||||
<i class="ace-icon fa fa-chevron-up" ng-class="{'fa-chevron-up': !isConfigCollapsed, 'fa-chevron-down': isConfigCollapsed}"></i>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="widget-body">
|
||||
<div class="widget-body-inner" style="display: block;">
|
||||
<div class="widget-main no-padding" collapse="isConfigCollapsed">
|
||||
<table class="table table-striped">
|
||||
<tbody>
|
||||
<tr ng-repeat="(key, value) in global_config">
|
||||
<td>{{key}}</td>
|
||||
<td>{{value}}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Server Credentials</td>
|
||||
<td></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Username</td>
|
||||
<td>{{server_credentials.username}}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Password</td>
|
||||
<td>{{server_credentials.password}}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-sm-6">
|
||||
<div class="widget-box transparent margin-top-minus10">
|
||||
<div class="widget-header widget-header-flat">
|
||||
<h4 class="widget-title lighter" ng-click="returnStep('security')">
|
||||
<i class="ace-icon fa fa-lock"></i>
|
||||
Credentials
|
||||
Target System Configurations
|
||||
</h4>
|
||||
<div class="widget-toolbar no-border">
|
||||
<ul class="nav nav-tabs">
|
||||
|
|
@ -207,45 +248,20 @@
|
|||
</tbody>
|
||||
</table>
|
||||
</script>
|
||||
<script type="text/ng-template" id="server.tpl.html">
|
||||
<h6>
|
||||
<strong>Username:</strong>
|
||||
{{server_credentials.username}}
|
||||
</h6>
|
||||
<h6>
|
||||
<strong>Password:</strong>
|
||||
{{server_credentials.password}}
|
||||
</h6>
|
||||
</script>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-sm-6">
|
||||
<div class="widget-box transparent margin-top-minus10">
|
||||
<div class="widget-header widget-header-flat">
|
||||
<h4 class="widget-title lighter" ng-click="returnStep('os_global')">
|
||||
<i class="ace-icon fa fa-globe"></i>
|
||||
OS Global Configurations
|
||||
</h4>
|
||||
<div class="widget-toolbar">
|
||||
<a class="action" ng-click="isConfigCollapsed = !isConfigCollapsed">
|
||||
<i class="ace-icon fa fa-chevron-up" ng-class="{'fa-chevron-up': !isConfigCollapsed, 'fa-chevron-down': isConfigCollapsed}"></i>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="widget-body">
|
||||
<div class="widget-body-inner" style="display: block;">
|
||||
<div class="widget-main no-padding" collapse="isConfigCollapsed">
|
||||
<script type="text/ng-template" id="ceph.tpl.html">
|
||||
<table class="table table-striped">
|
||||
<tbody>
|
||||
<tr ng-repeat="(key, value) in global_config">
|
||||
<tr ng-repeat="(key, value) in cephConfig.global_config">
|
||||
<td>{{key}}</td>
|
||||
<td>{{value}}</td>
|
||||
</tr>
|
||||
<tr ng-repeat="(key, value) in cephConfig.osd_config">
|
||||
<td>{{key}}</td>
|
||||
<td>{{value}}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</script>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1632,22 +1632,27 @@ define(['uiRouter', 'angularTable', 'angularDragDrop', 'angularTouch', 'ngSpinne
|
|||
$scope.service_credentials = wizardFactory.getServiceCredentials();
|
||||
$scope.console_credentials = wizardFactory.getConsoleCredentials();
|
||||
$scope.global_config = wizardFactory.getGeneralConfig();
|
||||
$scope.cephConfig = wizardFactory.getCephConfig();
|
||||
|
||||
dataService.getServerColumns().success(function(data) {
|
||||
$scope.server_columns = data.review;
|
||||
});
|
||||
|
||||
$scope.tabs = [{
|
||||
title: 'Database & Queue',
|
||||
url: 'service.tpl.html'
|
||||
"title": "Database & Queue",
|
||||
"url": "service.tpl.html"
|
||||
}, {
|
||||
title: 'Keystone User',
|
||||
url: 'console.tpl.html'
|
||||
}, {
|
||||
title: 'Server',
|
||||
url: 'server.tpl.html'
|
||||
"title": "Keystone User",
|
||||
"url": "console.tpl.html"
|
||||
}];
|
||||
|
||||
if ($scope.currentAdapterName == "ceph_openstack_icehouse") {
|
||||
$scope.tabs.push({
|
||||
"title": "Ceph",
|
||||
"url": "ceph.tpl.html"
|
||||
});
|
||||
}
|
||||
|
||||
$scope.currentTab = $scope.tabs[0].url;
|
||||
|
||||
$scope.onClickTab = function(tab) {
|
||||
|
|
@ -1743,7 +1748,6 @@ define(['uiRouter', 'angularTable', 'angularDragDrop', 'angularTouch', 'ngSpinne
|
|||
}
|
||||
}
|
||||
};
|
||||
|
||||
});
|
||||
|
||||
wizardModule.directive('ngKeypress', function() {
|
||||
|
|
|
|||
Loading…
Reference in New Issue