aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaphaël Pinson <raphael.pinson@camptocamp.com>2012-12-13 06:46:38 -0800
committerRaphaël Pinson <raphael.pinson@camptocamp.com>2012-12-13 06:46:38 -0800
commit5486843f40439050f4aa6a94fab8d2bf45037942 (patch)
tree69668f06956917934c68d7fc9b4f9bb12b13f620
parent109f35f97718bc607db179533461f2805a60a136 (diff)
parenta9d46534106eeea53ce3fe8122ec9d2d364cda0b (diff)
downloadpuppet-dhcp-5486843f40439050f4aa6a94fab8d2bf45037942.tar.gz
puppet-dhcp-5486843f40439050f4aa6a94fab8d2bf45037942.tar.bz2
Merge pull request #3 from mcanevet/lint
Lint
-rw-r--r--manifests/params.pp2
-rw-r--r--manifests/server.pp18
2 files changed, 11 insertions, 9 deletions
diff --git a/manifests/params.pp b/manifests/params.pp
index d14746c..d2ba584 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -20,7 +20,7 @@ class dhcp::params {
}
default: {
- fail "${name} is not available for ${operatingsystem}/${lsbdistcodename}"
+ fail "${name} is not available for ${::operatingsystem}/${::lsbdistcodename}"
}
}
diff --git a/manifests/server.pp b/manifests/server.pp
index 7d56854..6bdf51f 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -7,15 +7,16 @@ Requires:
module "common": git://github.com/camptocamp/puppet-common.git
facultative argument:
- *$dhcpd_ddns_update* : ddns-update-style option (default to none)
- *$dhcpd_authoritative* : set it if you want that your DHCP server is authoritative (default to no)
- *$dhcpd_opts* : any other DHCPD valid options
+ *$dhcpd_ddns_update* : ddns-update-style option (default to none)
+ *$dhcpd_authoritative* : set it if you want that your DHCP server is
+ authoritative (default to no)
+ *$dhcpd_opts* : any other DHCPD valid options
Example:
node "dhcp.toto.ltd" {
$dhcpd_opts = ['domain-name "toto.ltd"', "domain-name-servers 192.168.21.1"]
include dhcp::server
-
+
dhcp::subnet {"10.27.20.0":
ensure => present,
broadcast => "10.27.20.255",
@@ -23,15 +24,16 @@ node "dhcp.toto.ltd" {
}
dhcp::host {"titi-eth0":
- ensure => present,
- mac => "0e:18:fa:fe:d9:00",
- subnet => "10.27.20.0",
+ ensure => present,
+ mac => "0e:18:fa:fe:d9:00",
+ subnet => "10.27.20.0",
fixed_address => "10.27.10.52",
}
}
*/
+
class dhcp::server {
- case $operatingsystem {
+ case $::operatingsystem {
Debian: { include dhcp::server::debian }
}
}