aboutsummaryrefslogtreecommitdiff
path: root/puppet/manifests/nodes
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2015-11-06 11:01:26 -0200
committerSilvio Rhatto <rhatto@riseup.net>2015-11-06 11:01:26 -0200
commit8748f432cdb01090767001523496f096345a492b (patch)
treecba4fd0d8d4501424c7fb5e84ba37dc2cdd7fca4 /puppet/manifests/nodes
parent506b62a99e35c69354e8bc977780e41117f1e6ca (diff)
parent5512c493e13998d4c83d7eab3d89e5a1c0836566 (diff)
downloaddebian-8748f432cdb01090767001523496f096345a492b.tar.gz
debian-8748f432cdb01090767001523496f096345a492b.tar.bz2
Merge commit '5512c493e13998d4c83d7eab3d89e5a1c0836566' into develop
Conflicts: puppet/puppet.conf
Diffstat (limited to 'puppet/manifests/nodes')
-rw-r--r--puppet/manifests/nodes/default.pp3
1 files changed, 3 insertions, 0 deletions
diff --git a/puppet/manifests/nodes/default.pp b/puppet/manifests/nodes/default.pp
new file mode 100644
index 0000000..5ebbf90
--- /dev/null
+++ b/puppet/manifests/nodes/default.pp
@@ -0,0 +1,3 @@
+node default {
+ include nodo
+}