summaryrefslogtreecommitdiff
path: root/global/overlay/etc/puppet/modules/sunet
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2015-05-08 16:07:56 +0200
committerLeif Johansson <leifj@sunet.se>2015-05-08 16:07:56 +0200
commit1e8bb5e3ebbfe8c501156a5f512f7d89d5acec2e (patch)
treedf44378344371ebce9fc4c362fb56a51fe66b5f6 /global/overlay/etc/puppet/modules/sunet
parent41f2460e5bbf7b824d43a5c4e6a2e762475301dd (diff)
Diffstat (limited to 'global/overlay/etc/puppet/modules/sunet')
-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 463df42..a8a3bfe 100644
--- a/global/overlay/etc/puppet/modules/sunet/manifests/cloudimage.pp
+++ b/global/overlay/etc/puppet/modules/sunet/manifests/cloudimage.pp
@@ -12,7 +12,7 @@ define sunet::cloudimage (
$ip6 = undef,
$netmask6 = "64",
$gateway6 = undef,
- $tag = undef,
+ $tagpattern = undef,
$repo = 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 a3a9190..c80a84c 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
@@ -8,7 +8,7 @@ bridge="<%= @bridge %>"
cpus="<%= @cpus %>"
mem="<%= @memory %>"
repo="<%= @repo %>"
-tag="<%= @tag %>"
+tag="<%= @tagpattern %>"
ip="<%= @ip %>"
gateway="<%= @gateway %>"
netmask="<%= @netmask %>"