openstack/tripleo-heat-templates
Code Issues Proposed changes

Remove defaults from masquerade-networks service env

Browse Source 
Don't always masquerade these defaults, masquerading
should only happen to the ctlplane subnets defined
in undercloud.conf if masquerading is true.

Closes-Bug: #1794729
Depends-On: I11b325458517334f97fc5f4754b4b39efff3a3f3
Change-Id: I4b956e8be92f1b7a71579d04c7e41c20da7ffdfa
This commit is contained in:
Harald Jensås 2018-10-11 23:01:01 +02:00
parent c1bf5d8b10
commit bf72e3636e
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
environments/services/masquerade-networks.yaml
View File

@ -2,6 +2,3 @@
resource_registry:
OS::TripleO::Services::MasqueradeNetworks: ../../puppet/services/masquerade-networks.yaml
parameter_defaults:
MasqueradeNetworks: {'192.168.24.0/24': ['192.168.24.0/24'], '10.0.0.0/24': ['10.0.0.0/24']}

7
releasenotes/notes/fix-default-masquerade-f91bfbcfe8a2a87d.yaml Normal file
View File

@ -0,0 +1,7 @@
---
fixes:
- |
When masqurading was eneabled on the Undercloud the networks
``192.168.24.0/24`` and ``10.0.0.0/24`` was always masqueraded.
(See `bug: 1794729 <https://bugs.launchpad.net/tripleo/+bug/1794729>`_.)