Revert "Fixed RAM string in Storage DropDown"

This reverts commit f07c3a7.
Tanzu-Solutions-Engineering · May 2, 2015 · d2516d6 · d2516d6
1 parent bd5e938
commit d2516d6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/main/resources/static/app/components/costing/costingController.js b/src/main/resources/static/app/components/costing/costingController.js
@@ -146,7 +146,7 @@ shekelApp.controller('ShekelCostingController', function($scope, vmLayout, aiSer
 			$scope.runCards.forEach(function(runCard){
 				var trBaseMonthly = $scope.calculateBaseMonthly(runCard.plan);
 				for (var i =0; i < $scope.forecasting.burndownMonths; i++ ) {
-					console.log(runCard);
+					//console.log(runCard);
 					if (runCard.runCard[i].costModelType == "Billable"){
 						var trRunCardIterationRevenue = runCard.runCard[i].plansInUse * trBaseMonthly;
 						trRunCards += trRunCardIterationRevenue;

diff --git a/src/main/resources/static/app/components/sizing/sizingController.js b/src/main/resources/static/app/components/sizing/sizingController.js
@@ -42,9 +42,9 @@ shekelApp.controller('ShekelSizingController', function($scope, $http, vmLayout,
 	 ];
 
     $scope.deaSizeOptionsDisk =  [ 
-         {"text": "Small (32GB)",    "size":32}, 
-         {"text": "Medium (64GB)",   "size":64},
-         {"text": "Large (128GB)",    "size":128}
+         {"text": "Small (32GB RAM)",    "size":32}, 
+         {"text": "Medium (64GB RAM)",   "size":64},
+         {"text": "Large (128GB RAM)",    "size":128}
     ];
 
     $scope.avgAIDiskOptions = [ 

diff --git a/src/main/resources/static/js/data/ers_vms_single_az_template.json b/src/main/resources/static/js/data/ers_vms_single_az_template.json
@@ -232,7 +232,7 @@
     },
     {
         "vm": "Doppler Server",
-        "instances": 2,
+        "instances": 1,
         "vcpu": 1,
         "ram": 1,
         "ephemeral_disk": 2,
@@ -243,7 +243,7 @@
     },
     {
         "vm": "Loggregator Traffic Controller",
-        "instances": 2,
+        "instances": 1,
         "vcpu": 1,
         "ram": 1,
         "ephemeral_disk": 2,