openstack
/
tripleo-quickstart-extras
Code Issues Proposed changes

Remove nat/masquerading config workarounds. 

1) This reverts commit e47d68eb11.
   That was technical debt, and with the new service in THT we don't need
   it anymore in Rocky.

2) This removes undercloud_external_network_cidr rule that shouldn't be
   useful since we control in THT for Rocky.

Closes-Bug: #1756183
Change-Id: I39b04f81803d76e419d1f3960edc4c927b2dbd4e
This commit is contained in:
Emilien Macchi 2018-03-30 08:56:24 -07:00
parent 5b3acb73de
commit 3605f546f2
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
roles/overcloud-prep-network/templates/overcloud-prep-network.sh.j2
View File

@ -23,14 +23,12 @@ if ! sudo iptables -nvL INPUT | grep "$COMMENT"; then
fi
{% endif %}
{% if network_isolation|bool and not overcloud_ipv6|bool %}
{% if network_isolation|bool and not overcloud_ipv6|bool and (release in ['newton','ocata','pike','queens'] or not containerized_undercloud|bool) %}
## Setup Networking
## ----------------
## * Enable Masquerading for undercloud network.
## This is technical debt, please look for full context:
## https://bugs.launchpad.net/tripleo/+bug/1756183
## This is only useful before Rocky cycle.
## ::
sudo iptables -w -t nat -D POSTROUTING -j BOOTSTACK_MASQ_OVB || true