Feature #4317: Remove instance-types conf

src/sunstone/etc/sunstone-server.conf

@@ -136,50 +136,6 @@
 #
 :oneflow_server: http://localhost:2474/
 
-
-################################################################################
-# Default instance types for the cloud view
-################################################################################
-#
-# These types are presented in the cloud view to customize VM Templates. Each
-# type is defined by:
-#   name: the name of the type
-#   cpu: capacity allocated to the VM for scheduling purposes
-#   vcpu: number of cores
-#   memory: in MB for the VM
-#   description: to help the user pick one, it may include purpose or price.
-:instance_types:
-    - :name: small-x1
-      :cpu: 1
-      :vcpu: 1
-      :memory: 128
-      :description: Very small instance for testing purposes
-    - :name: small-x2
-      :cpu: 2
-      :vcpu: 2
-      :memory: 512
-      :description: Small instance for testing multi-core applications
-    - :name: medium-x2
-      :cpu: 2
-      :vcpu: 2
-      :memory: 1024
-      :description: General purpose instance for low-load servers
-    - :name: medium-x4
-      :cpu: 4
-      :vcpu: 4
-      :memory: 2048
-      :description: General purpose instance for medium-load servers
-    - :name: large-x4
-      :cpu: 4
-      :vcpu: 4
-      :memory: 4096
-      :description: General purpose instance for servers
-    - :name: large-x8
-      :cpu: 8
-      :vcpu: 8
-      :memory: 8192
-      :description: General purpose instance for high-load servers
-
 ################################################################################
 # Routes
 ################################################################################

src/sunstone/sunstone-server.rb

@@ -288,10 +288,6 @@ helpers do
         session.clear
         return [204, ""]
     end
-
-    def cloud_view_instance_types
-        $conf[:instance_types] || []
-    end
 end
 
 before do

src/sunstone/views/index.erb

@@ -41,7 +41,6 @@
         'user_gid' : '<%= session[:user_gid] %>',
         'display_name' : '<%= session[:display_name] %>',
         'zone_name' : '<%= session[:zone_name] %>',
-        'instance_types' : JSON.parse('<%= cloud_view_instance_types().to_json %>'),
         'page_length' : '<%= session[:page_length] %>',
         'vm_logos' : <%= logos_conf.to_json %>
       };