sous-chefs · bmhughes · Apr 17, 2020 · Mar 20, 2020 · May 15, 2019 · Mar 29, 2020
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -8,3 +8,16 @@ workflows:
       - kitchen/danger:
           name: danger
           context: Danger-Minimal
+  kitchen-v6:
+    jobs:
+      - kitchen/dokken-single:
+          enable-ipv6: true
+          matrix:
+            parameters:
+              suite:
+                - default-centos-6
+                - default-centos-7
+                - default-centos-8
+                - default-fedora-31
+                - default-debian-10
+                - default-ubuntu-1804
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -40,11 +40,15 @@ jobs:
     strategy:
       matrix:
         os:
-          - 'debian-8'
+          - 'debian-10'
+          - 'centos-6'
           - 'centos-7'
-          - 'ubuntu-1604'
+          - 'centos-8'
+          - 'fedora-31'
+          - 'ubuntu-1804'
         suite:
           - 'default'
+          - 'delete'
       fail-fast: false
 
     steps:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,18 @@
 # CHANGELOG
 
-## Unreleased
-
-- Migrated to github actions
+## 7.0.0 (2020-04-13)
+
+Version 7.0.0 is a **major** change! Please see [UPGRADING.md](./UPGRADING.md).
+
+- DHCPv6 server configuration support - [@bmhughes](https://github.com/bmhughes)
+- Migrated to github actions - [@Xorima](https://github.com/Xorima)
+- Remodel cookbook as resource library - [@bmhughes](https://github.com/bmhughes)
+- Remove - [@bmhughes](https://github.com/bmhughes)
+  - Attributes
+  - Recipes
+  - Data bag functionality
+- Add resources to manage install and services for dhcpd/dhcpd6 - [@bmhughes](https://github.com/bmhughes)
+- Rewrite resources to current standard removing pure ruby code - [@bmhughes](https://github.com/bmhughes)
 
 ## 6.1.0 (2019-10-19)
 

diff --git a/README.md b/README.md
diff --git a/UPGRADING.md b/UPGRADING.md
@@ -0,0 +1,65 @@
+# Upgrading
+
+This document will give you help on upgrading major versions of dhcp
+
+## 7.0.0
+
+Version 7.0.0 is a major rewrite of the cookbook to current standards, remodelling as a resource library cookbook and the addition of DHCPv6 support.
+
+### Removed
+
+- All attributes
+- All recipes
+  - Enumeration of resources from data bags with this cookbook is not longer supported, you will have to write your own wrapper cookbook if you
+    depend on this functionality.
+- Resource `dhcp_pool`
+  - Pool verification is now provided by the `dhcp_subnet` resource
+
+### Added
+
+- Resource `dhcp_config` - [Documentation](./documentation/dhcp_config.md)
+  - Replacement for the `_config` recipe
+  - Global configuration
+  - DHCP failover configuration
+  - Configuration of service environment file
+
+- Resource `dhcp_package` - [Documentation](./documentation/dhcp_package.md)
+  - Replacement for the `_package` recipe
+  - Installs the relevant packages for platform
+
+- Resource `dhcp_service` - [Documentation](./documentation/dhcp_service.md)
+  - Replacement for the `_service` recipe
+  - Creates a systemd unit file for the platform
+  - Controls service activation
+
+### Changed
+
+- Common
+  - Custom resources have been rewritten in current style
+  - Relevant resources have `options` and `parameters` properties to allow more flexible user defined configuration
+  - Template files are overrideable with `cookbook` and `template` parameters to allow user template selection
+  - `owner`, `group` and `mode` properties to control the resultant permissions and mode of the generated files
+  - DHCPv6 support for all resources, use `ip_version` to select
+
+- Resource `dhcp_class` - [Documentation](./documentation/dhcp_class.md)
+  - `:delete` action added
+  - `subclasses` are now specified via `Hash` rather than a `Block`
+
+- Resource `dhcp_group` - [Documentation](./documentation/dhcp_group.md)
+  - `:delete` action added
+
+- Resource `dhcp_host` - [Documentation](./documentation/dhcp_host.md)
+  - `:delete` action added
+  - `hostname` property removed, specify it via `options`
+  - `macaddress` property is renamed to `identifier`
+  - `ipaddress` property is renamed to `address`
+
+- Resource `dhcp_shared_network` - [Documentation](./documentation/dhcp_shared_network.md)
+  - `:delete` action added
+  - Subnets are provided via included nested `dhcp_subnet` resources
+  - `subnets` are now specified via `Hash` rather than a `Block`
+
+- Resource `dhcp_subnet` - [Documentation](./documentation/dhcp_subnet.md)
+  - `:delete` action added
+  - `broadcast`, `routers`, `ddns` and `next-server` properties have been removed, specify them via `options` and `parameters`
+  - `pools` are now specified via `Hash` rather than a `Block`
diff --git a/attributes/default.rb b/attributes/default.rb
diff --git a/attributes/dns.rb b/attributes/dns.rb
diff --git a/documentation/dhcp_class.md b/documentation/dhcp_class.md
@@ -0,0 +1,60 @@
+# dhcp_class
+
+[Back to resource list](../README.md#resources)
+
+Create a DHCPD class configuration. (<https://kb.isc.org/docs/isc-dhcp-44-manual-pages-dhcpdconf#client-classing>)
+
+Introduced: v7.0.0
+
+## Actions
+
+- `:create`
+- `:delete`
+
+## Properties
+
+| Name                   | Type          | Default                          | Description                                                         | Allowed Values      |
+| ---------------------- | ------------- | -------------------------------- | ------------------------------------------------------------------- | ------------------- |
+| `comment`              | String        | `nil`                            | Comment to add to the configuration file                            |                     |
+| `ip_version`           | Symbol        | `:ipv4`                          | Select DHCP or DHCPv6 server to configure                           | `:ipv4`, `:ipv6`    |
+| `conf_dir`             | String        | `/etc/dhcp/dhcpd(6).d/classes.d` | Directory to create configuration file in                           |                     |
+| `cookbook`             | String        | `/etc/dhcp/dhcpd(6).d/classes.d` | Cookbook to source configuration file template from                 |                     |
+| `template`             | String        | `/etc/dhcp/dhcpd(6).d/classes.d` | Template to use to generate the configuration file                  |                     |
+| `owner`                | String        | Platform dependant               | Owner of the generated configuration file                           |                     |
+| `group`                | String        | Platform dependant               | Group of the generated configuration file                           |                     |
+| `mode`                 | String        | `'0640'`                         | Filemode of the generated configuration file                        |                     |
+| `match`                | String        | `nil`                            | DHCPD match statement                                               |                     |
+| `options`              | Array, Hash   | `nil`                            | DHCPD options for the class                                         |                     |
+| `parameters`           | Array, Hash   | `nil`                            | DHCPD parameters for the class                                      |                     |
+| `subclass`             | Array         | `nil`                            | Subclasses to include within the class                              |                     |
+
+## Examples
+
+```ruby
+dhcp_class 'BlankClass' do
+  match 'hardware'
+end
+```
+
+```ruby
+dhcp_class 'RegisteredHosts' do
+  match 'hardware'
+  subclass [
+    '1:10:bf:48:42:55:01',
+    '1:10:bf:48:42:55:02',
+  ]
+end
+```
+
+```ruby
+dhcp_class 'SpecialHosts' do
+  match 'hardware'
+  subclass [
+    '1:10:bf:48:42:56:01',
+    '1:10:bf:48:42:56:02',
+  ]
+  option(
+    'special-option' => 'value'
+  )
+end
+```
diff --git a/documentation/dhcp_config.md b/documentation/dhcp_config.md
@@ -0,0 +1,94 @@
+# dhcp_config
+
+[Back to resource list](../README.md#resources)
+
+Create and manage the main DHCPD configuration. (<https://kb.isc.org/docs/isc-dhcp-44-manual-pages-dhcpdconf>)
+
+Introduced: v7.0.0
+
+## Actions
+
+- `:create`
+- `:delete`
+
+## Properties
+
+| Name                   | Type          | Default                          | Description                                                         | Allowed Values      |
+| ---------------------- | ------------- | -------------------------------- | ------------------------------------------------------------------- | ------------------- |
+| `comment`              | String        | `nil`                            | Comment to add to the configuration file                            |                     |
+| `ip_version`           | Symbol        | `:ipv4`                          | Select DHCP or DHCPv6 server to configure                           | `:ipv4`, `:ipv6`    |
+| `conf_dir`             | String        | `/etc/dhcp/dhcpd(6).d/classes.d` | Directory to create configuration file in                           |                     |
+| `cookbook`             | String        | `/etc/dhcp/dhcpd(6).d/classes.d` | Cookbook to source configuration file template from                 |                     |
+| `template`             | String        | `/etc/dhcp/dhcpd(6).d/classes.d` | Template to use to generate the configuration file                  |                     |
+| `owner`                | String        | Platform dependant               | Owner of the generated configuration file                           |                     |
+| `group`                | String        | Platform dependant               | Group of the generated configuration file                           |                     |
+| `mode`                 | String        | `'0640'`                         | Filemode of the generated configuration file                        |                     |
+| `config_failover_file` | String        | `/etc/dhcp/dhcpd.failover.conf`  | DHCP failover configuration file path                               |                     |
+| `config_includes_directory` | String   | `/etc/dhcp/dhcpd(6).d`           | Directory to create included configuration files in                 |                     |
+| `lib_dir`              | String        | Platform dependant               | DHCPD lib directory path                                            |                     |
+| `lease_file`           | String        | Platform dependant               | DHCPD lease file path                                               |                     |
+| `allow`                | Array         | `nil`                            |                                                                     |                     |
+| `deny`                 | Array         | `nil`                            |                                                                     |                     |
+| `ignore`               | Array         | `nil`                            |                                                                     |                     |
+| `parameters`           | Array, Hash   | `nil`                            | DHCPD global parameters                                             |                     |
+| `options`              | Array, Hash   | `nil`                            | DHCPD global options                                                |                     |
+| `evals`                | Array         | `nil`                            | DHCPD conditional statements (see dhcp-eval(5))                     |                     |
+| `keys`                 | Hash          | `nil`                            | TSIG keys configuration                                             |                     |
+| `zones`                | Hash          | `nil`                            | Dynamic DNS zone configuration                                      |                     |
+| `hooks`                | Hash          | `nil`                            | Server event action configuration                                   |                     |
+| `failover`             | Hash          | `nil`                            | DHCP failover configuration                                         |                     |
+| `include_files`        | Array         | `nil`                            | Additional configuration files to include                           |                     |
+| `extra_lines`          | String, Array | `nil`                            | Extra lines to append to the configuration file                     |                     |
+
+## Examples
+
+```ruby
+dhcp_config '/etc/dhcp/dhcpd.conf' do
+  allow %w(booting bootp unknown-clients)
+  parameters(
+    'default-lease-time' => 7200,
+    'ddns-update-style' => 'interim',
+    'max-lease-time' => 86400,
+    'update-static-leases' => true,
+    'one-lease-per-client' => true,
+    'authoritative' => '',
+    'ping-check' => true
+  )
+  options(
+    'domain-name' => '"test.domain.local"',
+    'domain-name-servers' => '8.8.8.8',
+    'host-name' => ' = binary-to-ascii (16, 8, "-", substring (hardware, 1, 6))'
+  )
+  hooks(
+    'commit' => ['use-host-decl-names on'],
+    'release' => ['use-host-decl-names on']
+  )
+  include_files [
+    '/etc/dhcp/extra1.conf',
+    '/etc/dhcp/extra2.conf',
+    '/etc/dhcp_override/list.conf',
+  ]
+  action :create
+end
+```
+
+```ruby
+dhcp_config '/etc/dhcp/dhcpd6.conf' do
+  ip_version :ipv6
+  deny %w(duplicates)
+  parameters(
+    'default-lease-time' => 7200,
+    'ddns-updates' => 'on',
+    'ddns-update-style' => 'interim',
+    'max-lease-time' => 86400,
+    'update-static-leases' => true,
+    'one-lease-per-client' => 'on',
+    'authoritative' => '',
+    'ping-check' => true
+  )
+  options(
+    'dhcp6.name-servers' => '2001:4860:4860::8888, 2001:4860:4860::8844'
+  )
+  action :create
+end
+```
diff --git a/documentation/dhcp_group.md b/documentation/dhcp_group.md
@@ -0,0 +1,39 @@
+# dhcp_group
+
+[Back to resource list](../README.md#resources)
+
+Create a DHCPD group configuration. (<https://kb.isc.org/docs/isc-dhcp-44-manual-pages-dhcpdconf#reference-declarations> - *The **group** statement*)
+
+Introduced: v7.0.0
+
+## Actions
+
+- `:create`
+- `:delete`
+
+## Properties
+
+| Name                   | Type          | Default                          | Description                                                         | Allowed Values      |
+| ---------------------- | ------------- | -------------------------------- | ------------------------------------------------------------------- | ------------------- |
+| `comment`              | String        | `nil`                            | Comment to add to the configuration file                            |                     |
+| `ip_version`           | Symbol        | `:ipv4`                          | Select DHCP or DHCPv6 server to configure                           | `:ipv4`, `:ipv6`    |
+| `conf_dir`             | String        | `/etc/dhcp/dhcpd(6).d/groups.d`  | Directory to create configuration file in                           |                     |
+| `cookbook`             | String        | `/etc/dhcp/dhcpd(6).d/groups.d`  | Cookbook to source configuration file template from                 |                     |
+| `template`             | String        | `/etc/dhcp/dhcpd(6).d/groups.d`  | Template to use to generate the configuration file                  |                     |
+| `owner`                | String        | Platform dependant               | Owner of the generated configuration file                           |                     |
+| `group`                | String        | Platform dependant               | Group of the generated configuration file                           |                     |
+| `mode`                 | String        | `'0640'`                         | Filemode of the generated configuration file                        |                     |
+| `parameters`           | Array, Hash   | `nil`                            | DHCPD parameters for the group                                      |                     |
+| `options`              | Array, Hash   | `nil`                            | DHCPD options for the group                                         |                     |
+| `evals`                | Array         | `nil`                            | DHCPD conditional statements for the group (see dhcp-eval(5))       |                     |
+| `hosts`                | Hash          | `nil`                            | Hosts configuration to include within the group                     |                     |
+
+## Examples
+
+```ruby
+dhcp_group 'IPPgones' do
+  options(
+    'tftp-server-name' => '192.0.2.10'
+  )
+end
+```