Use roles from the cluster flavor

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

View File

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

View File

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