Adapt allowed methods for inet6 family for Debian 7

Fork: 0

x-way / puppet-interfaces

Browse code Adapt allowed methods for inet6 family for Debian 7 master
1 parent c80cf32 commit f688bceac9634653d9041b383e325d0bc972e4a2 Andreas Jaggi authored on 27 Jul 2014

Patch

Unified Split

Showing 2 changed files

                Ignore Space
               Show notes
              View
            
          
          4 ■■■■■
          manifests/iface.pp
         fail('method parameter must be one of loopback, static, manual, dhcp, bootp, tunnel, ppp, wvdial or ipv4ll for family inet')
      }
    }
    inet6: {
      if ! ($method in [loopback, static, manual, v4tunnel]) {
        fail('method parameter must be one of loopback, static, manual or v4tunnel for family inet6')
      if ! ($method in [auto, loopback, static, manual, dhcp, v4tunnel, 6to4]) {
        fail('method parameter must be one of auto, loopback, static, manual, dhcp, v4tunnel or 6to4 for family inet6')
      }
    }
    ipx: {
      if ! ($method in [static, dynamic]) {
         fail('method parameter must be one of loopback, static, manual, dhcp, bootp, tunnel, ppp, wvdial or ipv4ll for family inet')
       }
     }
     inet6: {
+      if ! ($method in [loopback, static, manual, v4tunnel]) {
+        fail('method parameter must be one of loopback, static, manual or v4tunnel for family inet6')
+      if ! ($method in [auto, loopback, static, manual, dhcp, v4tunnel, 6to4]) {
+        fail('method parameter must be one of auto, loopback, static, manual, dhcp, v4tunnel or 6to4 for family inet6')
       }
     }
     ipx: {
       if ! ($method in [static, dynamic]) {

                Ignore Space
               Show notes
              View
            
          
          2 ■■■■■
          spec/defines/iface_spec.rb
   it {
    expect {
      should contain_concat__fragment('interfaces::iface_eth0').with_target('/etc/network/interfaces')
    }.to raise_error(Puppet::Error, /method parameter must be one of loopback, static, manual or v4tunnel for family inet6/)
    }.to raise_error(Puppet::Error, /method parameter must be one of auto, loopback, static, manual, dhcp, v4tunnel or 6to4 for family inet6/)
  }
end
 
describe 'interfaces::iface' do
   it {
     expect {
       should contain_concat__fragment('interfaces::iface_eth0').with_target('/etc/network/interfaces')
+    }.to raise_error(Puppet::Error, /method parameter must be one of loopback, static, manual or v4tunnel for family inet6/)
+    }.to raise_error(Puppet::Error, /method parameter must be one of auto, loopback, static, manual, dhcp, v4tunnel or 6to4 for family inet6/)
   }
 end
 describe 'interfaces::iface' do

Show line notes below