Add omapi_name, key, algorithm parameters

Creates a new key section for configuring access to the OMAPI service. Fixes voxpupuli#90
cegeka · Mar 3, 2017 · 4a55dc0 · 4a55dc0
1 parent 0dffb40
commit 4a55dc0
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -135,6 +135,9 @@ The following is the list of all parameters available for this class.
 | `nameservers`          | Array     | `[ '8.8.8.8', '8.8.4.4' ]`        |
 | `nameservers_ipv6`     | Array     | `[]`                              |
 | `ntpservers`           | Array     | `[]`                              |
+| `omapi_algorithm`      | String    | `HMAC-MD5`                        |
+| `omapi_key`            | String    | `undef`                           |
+| `omapi_name`           | String    | `undef`                           |
 | `omapi_port`           | Integer   | `undef`                           |
 | `option_code150_label` | String    | `pxegrub`                         |
 | `option_code150_value` | String    | `text`                            |

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -29,7 +29,10 @@
   $max_lease_time       = 86400,
   $service_ensure       = running,
   $globaloptions        = '',
-  $omapi_port           = undef,
+  Optional[Integer[0,65535]] $omapi_port = undef,
+  Optional[String] $omapi_name = undef,
+  String $omapi_algorithm = 'HMAC-MD5',
+  Optional[String] $omapi_key = undef,
   $authoritative        = true,
   $extra_config         = '',
   $dhcp_dir             = $dhcp::params::dhcp_dir,
@@ -82,6 +85,12 @@
     validate_integer($mtu)
   }
 
+  if $omapi_name or $omapi_key {
+    if !$omapi_port or ! $omapi_name or ! $omapi_key or ! $omapi_algorithm {
+      fail('$omapi_port, $omapi_name, $omapi_key and $omapi_algorithm are required when defining an OMAPI key')
+    }
+  }
+
   # Incase people set interface instead of interfaces work around
   # that. If they set both, use interfaces and the user is a unwise
   # and deserves what they get.

diff --git a/spec/classes/dhcp_spec.rb b/spec/classes/dhcp_spec.rb
@@ -116,8 +116,28 @@
           )
         end
 
-        it 'defines dhcp header contents' do
-          is_expected.to contain_concat__fragment('dhcp-conf-header')
+        it 'sets omapi-port' do
+          is_expected.to contain_concat__fragment('dhcp-conf-header').with_content(%r{^omapi-port 7911;})
+        end
+
+        context 'and omapi_name, omapi_key' do
+          let :params do
+            default_params.merge(
+              interfaces: ['eth0'],
+              omapi_port: 7911,
+              omapi_name: 'keyname',
+              omapi_key: 'keyvalue'
+            )
+          end
+
+          it 'adds key section' do
+            is_expected.to contain_concat__fragment('dhcp-conf-header').with_content(%r{^key keyname \{})
+            is_expected.to contain_concat__fragment('dhcp-conf-header').with_content(%r{^\s*algorithm HMAC-MD5;})
+          end
+
+          it 'sets key secret' do
+            is_expected.to contain_concat__fragment('dhcp-conf-header').with_content(%r{^\s*secret "keyvalue";})
+          end
         end
       end
 

diff --git a/templates/dhcpd.conf-header.erb b/templates/dhcpd.conf-header.erb
@@ -9,6 +9,13 @@ not authoritative;
 <% end -%>
 <% if @omapi_port -%>
 omapi-port <%= @omapi_port %>;
+<% if @omapi_name && @omapi_key -%>
+key <%= @omapi_name %> {
+  algorithm <%= @omapi_algorithm %>;
+  secret "<%= @omapi_key %>";
+}
+omapi-key <%= @omapi_name %>;
+<% end -%>
 <% end -%>
 default-lease-time <%= @default_lease_time %>;
 max-lease-time <%= @max_lease_time %>;