diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-11-25 14:45:13 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-11-25 14:45:13 +0000 |
| commit | 8a7af075916ec66c7ebafb5dd91549c24d4a3166 (patch) | |
| tree | c6d26232ca532d334ea1f8a492be357f83bd6305 /manifests | |
| parent | 7787653c89c89d14b65d1babc8f1abe8780ebedf (diff) | |
| parent | 688a79c6c68422c0f873074370b1bbc87c6d1007 (diff) | |
Merge "Do not configure state matching when using GRE"
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/firewall/rule.pp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/manifests/firewall/rule.pp b/manifests/firewall/rule.pp index c63162b..6801dc4 100644 --- a/manifests/firewall/rule.pp +++ b/manifests/firewall/rule.pp @@ -83,14 +83,21 @@ define tripleo::firewall::rule ( 'sport' => $sport, 'proto' => $proto, 'action' => $action, - 'state' => $state, 'source' => $source, 'iniface' => $iniface, 'chain' => $chain, 'destination' => $destination, } + if $proto != 'gre' { + $state_rule = { + 'state' => $state + } + } else { + $state_rule = {} + } + - $rule = merge($basic, $extras) + $rule = merge($basic, $state_rule, $extras) validate_hash($rule) create_resources('firewall', { "${title}" => $rule }) |