openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Remove defaults from masquerade-networks service env"

Browse Source
This commit is contained in:
Zuul 2018-11-15 21:08:42 +00:00 committed by Gerrit Code Review
commit dd71541477
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>`_.)