From 1e8bb5e3ebbfe8c501156a5f512f7d89d5acec2e Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Fri, 8 May 2015 16:07:56 +0200
Subject: tag is reserved

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

diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index 3f487c9..4b33e0e 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -281,7 +281,7 @@ node 'sto-tug-kvm-lab1.swamid.se' {
    sunet::cloudimage { 'test.sunet.se':
      dhcp       => false,
      repo       => 'git://git.nordu.net/sunet-ops.git',
-     tag        => 'sunet-ops',
+     tagpattrn  => 'sunet-ops',
      cpus       => '1',
      memory     => '1024',
      ip         => '130.242.125.88',
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 %>"
-- 
cgit v1.1