openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Revert "Ensure we get a subnet for ctlplane""

Browse Source
This commit is contained in:
Zuul 2019-08-13 14:59:21 +00:00 committed by Gerrit Code Review
commit 6a41ccef54
1 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
deployment/tripleo-firewall/tripleo-firewall-baremetal-puppet.yaml
View File

@ -39,12 +39,6 @@ parameters:
description: Whether IPtables rules should be purged before setting up the new ones. description: Whether IPtables rules should be purged before setting up the new ones.
type: boolean type: boolean
conditions:
get_ctlplane_from_hiera:
equals:
- get_param: [ServiceData, net_cidr_map, ctlplane]
- Null
outputs: outputs:
role_data: role_data:
description: Role data for the TripleO firewall settings description: Role data for the TripleO firewall settings
@ -54,14 +48,6 @@ outputs:
tripleo::firewall::manage_firewall: {get_param: ManageFirewall} tripleo::firewall::manage_firewall: {get_param: ManageFirewall}
tripleo::firewall::purge_firewall_rules: {get_param: PurgeFirewallRules} tripleo::firewall::purge_firewall_rules: {get_param: PurgeFirewallRules}
tripleo::tripleo_firewall::firewall_rules: tripleo::tripleo_firewall::firewall_rules:
if:
- get_ctlplane_from_hiera
-
"004 accept ssh from ctlplane subnet %{hiera('ctlplane_subnet')}":
source: "%{hiera('ctlplane_subnet')}"
proto: 'tcp'
port: 22
-
map_merge: map_merge:
repeat: repeat:
for_each: for_each: