summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2014-04-15 16:54:57 +0200
committervarac <varacanero@zeromail.org>2014-04-15 16:54:57 +0200
commitdae324f316666f65907c02877ffd566df45641f6 (patch)
tree946cdb99c7a9c267f2497e455349961535ab862a
parent98ed287783baad657bb2b0297de34629d14bb2f3 (diff)
fix concat::setup (#5503)
-rw-r--r--puppet/modules/site_config/manifests/setup.pp1
-rw-r--r--puppet/modules/site_config/manifests/vagrant.pp1
2 files changed, 2 insertions, 0 deletions
diff --git a/puppet/modules/site_config/manifests/setup.pp b/puppet/modules/site_config/manifests/setup.pp
index ffe01f53..6d89be86 100644
--- a/puppet/modules/site_config/manifests/setup.pp
+++ b/puppet/modules/site_config/manifests/setup.pp
@@ -1,4 +1,5 @@
class site_config::setup {
+ tag 'leap_base'
#
# this is applied before each run of site.pp
diff --git a/puppet/modules/site_config/manifests/vagrant.pp b/puppet/modules/site_config/manifests/vagrant.pp
index 04266735..8f50b305 100644
--- a/puppet/modules/site_config/manifests/vagrant.pp
+++ b/puppet/modules/site_config/manifests/vagrant.pp
@@ -1,6 +1,7 @@
class site_config::vagrant {
# class for vagrant nodes
+ include site_shorewall::defaults
# eth0 on vagrant nodes is the uplink if
shorewall::interface { 'eth0':
zone => 'net',