masquerade: stop using YAQL for iptables data

See https://bugs.launchpad.net/tripleo/+bug/1760211 but the YAQL + Heat
format hasn't helped us to build the data needed by Puppet to create
IPtables rules for masquerading.

We'll solve it in puppet-tripleo with native hash iterations, so for
that we just export MasqueradeNetworks to Hiera and we'll use this data
from the puppet module directly.

Depends-On: I8dda3c164de90954855979529de4f1100a858b45

Related-Bug: #1760211
Change-Id: I81379cf93f505fb65c1ad7e6a2adcc6942b04bc0
This commit is contained in:
Emilien Macchi 2018-04-02 09:07:53 -07:00
parent 02cacfd53a
commit 6f3e70313e
1 changed files with 3 additions and 24 deletions

View File

@ -41,28 +41,7 @@ outputs:
value:
service_name: masquerade_networks
config_settings:
tripleo.masquerade_networks.firewall_rules:
repeat:
for_each:
NETWORK: {get_param: MasqueradeNetworks}
INDEX:
yaql:
expression: range(len($.data)).select(str($))
data: {get_param: MasqueradeNetworks}
DESTINATIONS:
yaql:
expression: $.data.values().select(' - ' + $.join('\n - '))
data: {get_param: MasqueradeNetworks}
template: >
'137 routed_network return_INDEX':
table: 'nat'
source: 'NETWORK'
destination:
DESTINATIONS
jump: 'RETURN'
'138 routed_network masquerade_INDEX':
table: 'nat'
source: 'NETWORK'
jump: 'MASQUERADE'
step_config: ''
masquerade_networks: {get_param: MasqueradeNetworks}
step_config: |
include tripleo::masquerade_networks
upgrade_tasks: []