summaryrefslogtreecommitdiff
path: root/global/overlay
diff options
context:
space:
mode:
Diffstat (limited to 'global/overlay')
-rw-r--r--global/overlay/etc/puppet/modules/sunet/manifests/cloudimage.pp2
-rw-r--r--global/overlay/etc/puppet/modules/sunet/templates/cloudimage/mk_cloud_image.erb2
2 files changed, 2 insertions, 2 deletions
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 %>"