/ - Diff - puppet nftables - Koumbit's Redmine

     ##### <a name="table"></a>`table`
     Data type: `String`
     Data type: `Variant[String, Array[String, 1]]`
     table to add set to.
     table or array of tables to add the set to.
     Default value: `'inet-filter'`

     # @param setname name of set, equal to to title.
     # @param order concat ordering.
     # @param type type of set.
     # @param table table to add set to.
     # @param table table or array of tables to add the set to.
     # @param flags specify flags for set
     # @param timeout timeout in seconds
     # @param gc_interval garbage collection interval.
-...
       Pattern[/^[-a-zA-Z0-9_]+$/] $setname = $title,
       Pattern[/^\d\d$/] $order = '10',
       Optional[Enum['ipv4_addr', 'ipv6_addr', 'ether_addr', 'inet_proto', 'inet_service', 'mark']] $type = undef,
       String $table = 'inet-filter',
       Variant[String, Array[String, 1]] $table = 'inet-filter',
       Array[Enum['constant', 'dynamic', 'interval', 'timeout'], 0, 4] $flags = [],
       Optional[Integer] $timeout = undef,
       Optional[Integer] $gc_interval = undef,
-...
+        }
+      }
       if $ensure == 'present' {
         concat::fragment {
           "nftables-${table}-set-${setname}":
             order  => $order,
             target => "nftables-${table}",
+        }
       $_tables = Array($table, true)
         if $content {
           Concat::Fragment["nftables-${table}-set-${setname}"] {
             content => "  ${content}",
+          }
         } elsif $source {
           Concat::Fragment["nftables-${table}-set-${setname}"] {
             source => $source,
+          }
         } else {
           if $type == undef {
             fail('The way the resource is configured must have a type set')
       if $ensure == 'present' {
         $_tables.each |Integer $index, String $_table| {
           concat::fragment {
             "nftables-${_table}-set-${setname}":
               order  => $order,
               target => "nftables-${_table}",
+          }
           Concat::Fragment["nftables-${table}-set-${setname}"] {
             content => epp('nftables/set.epp',
+              {
                 'name'        => $setname,
                 'type'        => $type,
                 'flags'       => $flags,
                 'timeout'     => $timeout,
                 'gc_interval' => $gc_interval,
                 'elements'    => $elements,
                 'size'        => $size,
                 'policy'      => $policy,
                 'auto_merge'  => $auto_merge,
+              }
+            )
           if $content {
             Concat::Fragment["nftables-${_table}-set-${setname}"] {
               content => "  ${content}",
+            }
           } elsif $source {
             Concat::Fragment["nftables-${_table}-set-${setname}"] {
               source => $source,
+            }
           } else {
             if $type == undef {
               fail('The way the resource is configured must have a type set')
+            }
             Concat::Fragment["nftables-${_table}-set-${setname}"] {
               content => epp('nftables/set.epp',
+                {
                   'name'        => $setname,
                   'type'        => $type,
                   'flags'       => $flags,
                   'timeout'     => $timeout,
                   'gc_interval' => $gc_interval,
                   'elements'    => $elements,
                   'size'        => $size,
                   'policy'      => $policy,
                   'auto_merge'  => $auto_merge,
+                }
+              )
+            }
+          }
+        }
+      }

           include nftables::rules::wireguard
           include nftables::services::dhcpv6_client
           include nftables::services::openafs_client
           nftables::set{'my_test_set':
             type       => 'ipv4_addr',
             elements   => ['192.168.0.1', '10.0.0.2'],
             table      => ['inet-filter', 'ip-nat'],
+          }
           # nftables cannot be started in docker so replace service with a validation only.
           systemd::dropin_file{"zzz_docker_nft.conf":
             ensure  => present,

+              )
+            }
           end
           describe 'default table can be changed' do
             let(:params) do
+              {
                 type: 'ipv6_addr',
                 elements: ['2001:1458::1', '2001:1458:1::2'],
                 table: 'ip-nat'
+              }
             end
             it { is_expected.to compile }
             it {
               is_expected.to contain_concat__fragment('nftables-ip-nat-set-my_set').with(
                 target:  'nftables-ip-nat',
                 content: %r{^  set my_set \{\n    type ipv6_addr\n    elements = \{ 2001:1458::1, 2001:1458:1::2 \}\n  \}$}m,
                 order:   '10',
+              )
+            }
           end
           describe 'multiple tables no tables' do
             let(:params) do
+              {
                 type: 'ipv6_addr',
                 elements: ['2001:1458::1', '2001:1458:1::2'],
                 table: []
+              }
             end
             it { is_expected.not_to compile }
           end
           describe 'multiple tables' do
             let(:params) do
+              {
                 type: 'ipv6_addr',
                 elements: ['2001:1458::1', '2001:1458:1::2'],
                 table: ['inet-filter', 'ip-nat']
+              }
             end
             it { is_expected.to compile }
             it {
               is_expected.to contain_concat__fragment('nftables-inet-filter-set-my_set').with(
                 target:  'nftables-inet-filter',
                 content: %r{^  set my_set \{\n    type ipv6_addr\n    elements = \{ 2001:1458::1, 2001:1458:1::2 \}\n  \}$}m,
                 order:   '10',
+              )
               is_expected.to contain_concat__fragment('nftables-ip-nat-set-my_set').with(
                 target:  'nftables-ip-nat',
                 content: %r{^  set my_set \{\n    type ipv6_addr\n    elements = \{ 2001:1458::1, 2001:1458:1::2 \}\n  \}$}m,
                 order:   '10',
+              )
+            }
           end
         end
       end
     end

ID	c94658e1720b5632d3280ff14dbaa56b5fbe2bc8
Parent	5afbc789
Enfant	853ba757

Projet

Général

Profil

puppet nftables

Révision c94658e1