Merge pull request #17 from camptocamp/failover-corrected

Failover corrected

2 files changed, 50 insertions, 12 deletions

diff --git a/spec/acceptance/dhcp_failover_spec.rb b/spec/acceptance/dhcp_failover_spec.rb
new file mode 100644
index 0000000..5e93c67
--- /dev/null
+++ b/spec/acceptance/dhcp_failover_spec.rb
@@ -0,0 +1,38 @@
+require 'spec_helper_acceptance'
+
+describe 'dhcp::failover' do
+  describe 'with defaults' do
+    it 'should work with no error' do
+      pp = <<-EOS
+      class { 'dhcp::server': }
+      dhcp::failover {'my-failover':
+        peer_address => '1.1.1.1',
+        options      => {
+          'max-response-delay'       => 30,
+          'max-unacked-updates'      => 10,
+          'load balance max seconds' => 3,
+          'mclt'                     => 1800,
+          'split'                    => 128,
+        }
+      }
+      $ipaddr = split($::networking['interfaces']['eth0']['ip'], '[.]')
+      $sub = "${ipaddr[0]}.${ipaddr[1]}.${ipaddr[2]}"
+      dhcp::subnet {$::networking['interfaces']['eth0']['network']:
+        broadcast   => "${sub}.255",
+        subnet_mask => $::networking['interfaces']['eth0']['netmask'],
+        domain_name => 'test.com',
+        other_opts  => [
+          "option domain-name-servers ${sub}.1, ${sub}.2",
+          'option domain-search "test.com", "internal.test.com"',
+          'pool {',
+          'failover peer "my-failover"',
+          "range ${sub}.100 ${sub}.250",
+          '}',
+        ]
+      }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, :catch_changes  => true)
+    end
+  end
+end
diff --git a/spec/defines/dhcp_failover_spec.rb b/spec/defines/dhcp_failover_spec.rb
index d8400b0..75b30fb 100644
--- a/spec/defines/dhcp_failover_spec.rb
+++ b/spec/defines/dhcp_failover_spec.rb
@@ -21,7 +21,7 @@ describe 'dhcp::failover' do
 
         it 'should fail' do
           expect {
-            should contain_file('/etc/dhcp/failover/failover-dhcp.conf')
+            should contain_file('/etc/dhcp/failover.d/failover-dhcp.conf')
           }.to raise_error(Puppet::Error, /"foo" does not match \["present", "absent"\]/)
         end
       end
@@ -34,7 +34,7 @@ describe 'dhcp::failover' do
 
         it 'should fail' do
           expect {
-            should contain_file('/etc/dhcp/failover/failover-dhcp.conf')
+            should contain_file('/etc/dhcp/failover.d/failover-dhcp.conf')
           }.to raise_error(Puppet::Error, /true is not a string\./)
         end
       end
@@ -47,7 +47,7 @@ describe 'dhcp::failover' do
 
         it 'should fail' do
           expect {
-            should contain_file('/etc/dhcp/failover/failover-dhcp.conf')
+            should contain_file('/etc/dhcp/failover.d/failover-dhcp.conf')
           }.to raise_error(Puppet::Error, /is not a valid IPv4 address\./)
         end
       end
@@ -55,7 +55,7 @@ describe 'dhcp::failover' do
       context 'when not passing peer_address' do
         it 'should fail' do
           expect {
-            should contain_file('/etc/dhcp/failover/failover-dhcp.conf')
+            should contain_file('/etc/dhcp/failover.d/failover-dhcp.conf')
           }.to raise_error(Puppet::Error, /Must pass peer_address to Dhcp::Failover/)
         end
       end
@@ -67,7 +67,7 @@ describe 'dhcp::failover' do
 
         it 'should fail' do
           expect {
-            should contain_file('/etc/dhcp/failover/failover-dhcp.conf')
+            should contain_file('/etc/dhcp/failover.d/failover-dhcp.conf')
           }.to raise_error(Puppet::Error, /true is not a string\./)
         end
       end
@@ -79,7 +79,7 @@ describe 'dhcp::failover' do
 
         it 'should fail' do
           expect {
-            should contain_file('/etc/dhcp/failover/failover-dhcp.conf')
+            should contain_file('/etc/dhcp/failover.d/failover-dhcp.conf')
           }.to raise_error(Puppet::Error, /is not a valid IPv4 address\./)
         end
       end
@@ -92,7 +92,7 @@ describe 'dhcp::failover' do
 
         it 'should fail' do
           expect {
-            should contain_file('/etc/dhcp/failover/failover-dhcp.conf')
+            should contain_file('/etc/dhcp/failover.d/failover-dhcp.conf')
           }.to raise_error(Puppet::Error, /Expected first argument to be an Integer/)
         end
       end
@@ -105,7 +105,7 @@ describe 'dhcp::failover' do
 
         it 'should fail' do
           expect {
-            should contain_file('/etc/dhcp/failover/failover-dhcp.conf')
+            should contain_file('/etc/dhcp/failover.d/failover-dhcp.conf')
           }.to raise_error(Puppet::Error, /Expected first argument to be an Integer/)
         end
       end
@@ -117,7 +117,7 @@ describe 'dhcp::failover' do
           :peer_address => '1.2.3.4',
         } }
 
-        it { should contain_file('/etc/dhcp/failover/failover-dhcp.conf').with(
+        it { should contain_file('/etc/dhcp/failover.d/failover-dhcp.conf').with(
           :ensure  => 'file',
           :owner   => 'root',
           :group   => 'root'
@@ -135,7 +135,7 @@ describe 'dhcp::failover' do
           /peer port 647;\n/
         ) }
         it { should contain_concat__fragment('dhcp.failover.failover-dhcp').with({
-          :content => "include \"/etc/dhcp/failover/failover-dhcp.conf\";\n",
+          :content => "include \"/etc/dhcp/failover.d/failover-dhcp.conf\";\n",
           :target  => '/etc/dhcp/dhcpd.conf',
         })}
       end
@@ -152,7 +152,7 @@ describe 'dhcp::failover' do
           },
         } }
 
-        it { should contain_file('/etc/dhcp/failover/failover-dhcp.conf').with({
+        it { should contain_file('/etc/dhcp/failover.d/failover-dhcp.conf').with({
           :ensure  => 'file',
           :owner   => 'root',
           :group   => 'root'
@@ -183,7 +183,7 @@ describe 'dhcp::failover' do
           :role         => 'secondary',
         } }
 
-        it { should contain_file('/etc/dhcp/failover/failover-dhcp.conf').with({
+        it { should contain_file('/etc/dhcp/failover.d/failover-dhcp.conf').with({
           :ensure  => 'file',
           :owner   => 'root',
           :group   => 'root'