x/compass-web
Code Issues Proposed changes

Use roles from the cluster flavor

Browse Source 
Change-Id: I7f2a2fcefceb2d7daa3a7343f21d9ac41d7caec9
This commit is contained in:
Weidong Shao 2014-08-29 00:27:29 +00:00
parent 00fc751fce
commit 8f7b861f67
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
v2/src/app/wizard/network.tpl.html
View File

@ -93,7 +93,7 @@
<h4>Autofill Hostname</h4>
<select id="hostname-rule" class="input-large">
<option value="">Please select a pattern</option>
<option value="host">Host</option>
<option value="host" selected="selected">Host</option>
<option value="switch_ip">Switch IP</option>
</select>

2
v2/src/app/wizard/role_assignment.tpl.html
View File

@ -17,7 +17,7 @@
<div class="col-md-offset-4 col-md-8" style="margin-left: 33%;">
<span>
Total Hosts: {{servers.length}} | Total Roles: {{rolesTotalCount}}
</span>
</span>
<button style="margin-left: 18px;" type="button" class="btn btn-sm btn-info" ng-click="autoAssignRoles()" ng-disabled="autoAssignForm.$invalid">
Assign
</button>

6
v2/src/app/wizard/wizard.js
View File

@ -963,9 +963,9 @@ angular.module('compass.wizard', [
var cluster = wizardFactory.getClusterInfo();
$scope.servers = wizardFactory.getServers();
dataService.getAdapter(cluster.adapter_id).success(function(data) {
wizardFactory.setAdapter(data);
$scope.roles = data.roles;
dataService.getClusterById(cluster.id).success(function(data) {
// wizardFactory.setAdapter(data);
$scope.roles = data.falvor.roles;
});
dataService.getServerColumns().success(function(data) {