From 8f7b861f674777b7771724cd2edf43af82a9d386 Mon Sep 17 00:00:00 2001
From: Weidong Shao <weidong.shao@huawei.com>
Date: Fri, 29 Aug 2014 00:27:29 +0000
Subject: [PATCH] Use roles from the cluster flavor

Change-Id: I7f2a2fcefceb2d7daa3a7343f21d9ac41d7caec9
---
 v2/src/app/wizard/network.tpl.html         | 2 +-
 v2/src/app/wizard/role_assignment.tpl.html | 2 +-
 v2/src/app/wizard/wizard.js                | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/v2/src/app/wizard/network.tpl.html b/v2/src/app/wizard/network.tpl.html
index ac5e4d7..1f5532e 100644
--- a/v2/src/app/wizard/network.tpl.html
+++ b/v2/src/app/wizard/network.tpl.html
@@ -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>
 
diff --git a/v2/src/app/wizard/role_assignment.tpl.html b/v2/src/app/wizard/role_assignment.tpl.html
index 4eb89fb..94719be 100644
--- a/v2/src/app/wizard/role_assignment.tpl.html
+++ b/v2/src/app/wizard/role_assignment.tpl.html
@@ -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>
diff --git a/v2/src/app/wizard/wizard.js b/v2/src/app/wizard/wizard.js
index ed190d5..638eec4 100644
--- a/v2/src/app/wizard/wizard.js
+++ b/v2/src/app/wizard/wizard.js
@@ -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) {