From 0e8ba15f1bfc9a2a92019a20f3443d8181df57c1 Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Fri, 8 May 2015 15:58:22 +0200
Subject: memory

---
 global/overlay/etc/puppet/modules/sunet/manifests/cloudimage.pp         | 2 +-
 .../etc/puppet/modules/sunet/templates/cloudimage/mk_cloud_image.erb    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'global/overlay/etc')

diff --git a/global/overlay/etc/puppet/modules/sunet/manifests/cloudimage.pp b/global/overlay/etc/puppet/modules/sunet/manifests/cloudimage.pp
index 788fa41..fca56b6 100644
--- a/global/overlay/etc/puppet/modules/sunet/manifests/cloudimage.pp
+++ b/global/overlay/etc/puppet/modules/sunet/manifests/cloudimage.pp
@@ -3,7 +3,7 @@ define sunet::cloudimage (
   $dhcp        = true,
   $size        = "1G",
   $bridge      = "br0",
-  $mem         = "1024",
+  $memory      = "1024",
   $cpus        = "1",
   $resolver    = undef,
   $ip          = undef,
diff --git a/global/overlay/etc/puppet/modules/sunet/templates/cloudimage/mk_cloud_image.erb b/global/overlay/etc/puppet/modules/sunet/templates/cloudimage/mk_cloud_image.erb
index 16c8381..a3a9190 100644
--- a/global/overlay/etc/puppet/modules/sunet/templates/cloudimage/mk_cloud_image.erb
+++ b/global/overlay/etc/puppet/modules/sunet/templates/cloudimage/mk_cloud_image.erb
@@ -6,7 +6,7 @@ dhcp="<%= @dhcp ? 'yes' : 'no' %>"
 hostname="<%= @name %>"
 bridge="<%= @bridge %>"
 cpus="<%= @cpus %>"
-mem="<%= @mem %>"
+mem="<%= @memory %>"
 repo="<%= @repo %>"
 tag="<%= @tag %>"
 ip="<%= @ip %>"
-- 
cgit v1.1