diff options
| author | Leif Johansson <leifj@sunet.se> | 2015-05-08 15:58:22 +0200 |
|---|---|---|
| committer | Leif Johansson <leifj@sunet.se> | 2015-05-08 15:58:22 +0200 |
| commit | 0e8ba15f1bfc9a2a92019a20f3443d8181df57c1 (patch) | |
| tree | 35cfa4fe973075c861d42c3528186e58acf33819 /global | |
| parent | 98cd5491809facf2eb1e58e82c3cb05d95992a1d (diff) | |
memorysunet-ops-2015-05-08-v03
Diffstat (limited to 'global')
| -rw-r--r-- | global/overlay/etc/puppet/modules/sunet/manifests/cloudimage.pp | 2 | ||||
| -rw-r--r-- | global/overlay/etc/puppet/modules/sunet/templates/cloudimage/mk_cloud_image.erb | 2 |
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 %>" |