Projet

Général

Profil

Révision b6b5925f

IDb6b5925f5d23642f79734b2586ed3d4e1f59a99a
Parent 5791cc12
Enfant 6b7be248

Ajouté par mh il y a 6 mois

Fix problem with interfaces that contain :

Voir les différences:

manifests/bridges.pp
15 15
    $bridges = $interfaces.filter |$items| { $items =~ $bridgenames }
16 16

  
17 17
    $bridges.each |String $bridge| {
18
      $bridge_rulename = regsubst($bridge, '-', '_', 'G')
18
      $bridge_rulename = regsubst($bridge, '-|:', '_', 'G')
19 19
      nftables::rule { "default_fwd-bridge_${bridge_rulename}_${bridge_rulename}":
20 20
        order   => '08',
21 21
        content => "iifname ${bridge} oifname ${bridge} accept",
spec/classes/bridges_spec.rb
14 14
                  'lo' => {},
15 15
                  'br0' => {},
16 16
                  'br1-2' => {},
17
                } },
17
                  'br1-2:1' => {},
18
                } }
18 19
          )
19 20
        end
20 21

  
......
35 36
            content: 'iifname br1 oifname br1 accept',
36 37
          )
37 38
        }
39

  
40
        it {
41
          expect(subject).to contain_nftables__rule('default_fwd-bridge_br1_2_1_br1_2_1').with(
42
            order: '08',
43
            content: 'iifname br1-2:1 oifname br1-2:1 accept'
44
          )
45
        }
38 46
      end
39 47
    end
40 48
  end

Formats disponibles : Unified diff