openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Enable configuring tripleo-ipsec variables through IpsecVars"

This commit is contained in:
Zuul 2018-01-31 14:19:56 +00:00 committed by Gerrit Code Review
parent 7a120b64e8 0dcb51e101
commit fc21b64061
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
extraconfig/services/ipsec.yaml
View File

@ -33,6 +33,12 @@ parameters:
via parameter_defaults in the resource registry.
type: json
IpsecVars:
default: {}
description: Hash of ansible-tripleo-ipsec variables used to
configure IPSec tunnels.
type: json
outputs:
role_data:
description: Role data for the IPSEC service
@ -97,8 +103,10 @@ outputs:
- include_role:
name: tripleo-ipsec
vars:
ipsec_configure_vips: false
ipsec_skip_firewall_rules: false
map_merge:
- ipsec_configure_vips: false
ipsec_skip_firewall_rules: false
- {get_param: IpsecVars}
# In step 2 the pacemaker resources are created and the VIPs
# are assigned to the nodes. We need those VIPs to be assigned
# already before setting up the IPSEC tunnels. Hence we do this
@ -109,5 +117,7 @@ outputs:
- include_role:
name: tripleo-ipsec
vars:
ipsec_configure_vips: true
ipsec_skip_firewall_rules: true
map_merge:
- ipsec_configure_vips: true
ipsec_skip_firewall_rules: true
- {get_param: IpsecVars}