aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2015-09-11 11:02:04 -0300
committerSilvio Rhatto <rhatto@riseup.net>2015-09-11 11:02:04 -0300
commit29e0f20bf8489d4a3c338b6b9f18c73464f07fad (patch)
tree1b74d5c9b6d9d73d905041f21c65f611db352695
parent703111bf47f476ddbc20669ff6aeab62dcd2643a (diff)
parentf51930f88f81d48f51479bcdebb919ab4de8def9 (diff)
downloadpuppet-nodo-29e0f20bf8489d4a3c338b6b9f18c73464f07fad.tar.gz
puppet-nodo-29e0f20bf8489d4a3c338b6b9f18c73464f07fad.tar.bz2
Merge branch 'master' into develop
-rw-r--r--manifests/role/nas/raspberrypi.pp3
-rw-r--r--manifests/utils/network/analyzer.pp2
2 files changed, 4 insertions, 1 deletions
diff --git a/manifests/role/nas/raspberrypi.pp b/manifests/role/nas/raspberrypi.pp
new file mode 100644
index 0000000..394969e
--- /dev/null
+++ b/manifests/role/nas/raspberrypi.pp
@@ -0,0 +1,3 @@
+class nodo::role::nas::raspberrypi inherits nodo::base::raspberrypi {
+ include nodo::role::nas
+}
diff --git a/manifests/utils/network/analyzer.pp b/manifests/utils/network/analyzer.pp
index 4d19c43..956f10d 100644
--- a/manifests/utils/network/analyzer.pp
+++ b/manifests/utils/network/analyzer.pp
@@ -1,5 +1,5 @@
class nodo::utils::network::analyzer {
- package { [ 'tshark', 'arping', 'fping', 'oping', 'tcptraceroute', 'tcpstat', 'iperf' ]:
+ package { [ 'tshark', 'arping', 'fping', 'oping', 'tcptraceroute', 'tcpstat', 'iperf', 'zmap' ]:
ensure => installed,
}