From 33d7eafc9c85db50dba6b32f49de6b8dff86aa1d Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Thu, 9 Dec 2010 17:23:58 +0100 Subject: [PATCH] Add default values to OCCI custom.erb --- src/cloud/occi/etc/templates/custom.erb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/cloud/occi/etc/templates/custom.erb b/src/cloud/occi/etc/templates/custom.erb index 2b91f543e6..f000a411c1 100644 --- a/src/cloud/occi/etc/templates/custom.erb +++ b/src/cloud/occi/etc/templates/custom.erb @@ -4,5 +4,11 @@ # You can also add specific attributes for your cloud in this file (e.g. OS). # -CPU = "<%= @vm_info['CPU'] %>" -MEMORY = "<%= @vm_info['MEMORY'] %>" \ No newline at end of file +# Default values for VM capacity +<% + DEFAULT_CPU = 1 + DEFAULT_MEMORY = 128 +%> + +CPU = "<%= @vm_info['CPU'].nil? ? DEFAULT_CPU : @vm_info['CPU'] %>" +MEMORY = "<%= @vm_info['MEMORY'].nil? ? DEFAULT_MEMORY : @vm_info['MEMORY'] %>"