From bf72e3636eed44f87408d58788e9411d9ddaced5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Harald=20Jens=C3=A5s?= Date: Thu, 11 Oct 2018 23:01:01 +0200 Subject: [PATCH] Remove defaults from masquerade-networks service env 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 --- environments/services/masquerade-networks.yaml | 3 --- .../notes/fix-default-masquerade-f91bfbcfe8a2a87d.yaml | 7 +++++++ 2 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 releasenotes/notes/fix-default-masquerade-f91bfbcfe8a2a87d.yaml diff --git a/environments/services/masquerade-networks.yaml b/environments/services/masquerade-networks.yaml index 04ff9a80b8..6ebd15b0bf 100644 --- a/environments/services/masquerade-networks.yaml +++ b/environments/services/masquerade-networks.yaml @@ -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']} diff --git a/releasenotes/notes/fix-default-masquerade-f91bfbcfe8a2a87d.yaml b/releasenotes/notes/fix-default-masquerade-f91bfbcfe8a2a87d.yaml new file mode 100644 index 0000000000..384ebb7ab6 --- /dev/null +++ b/releasenotes/notes/fix-default-masquerade-f91bfbcfe8a2a87d.yaml @@ -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 `_.) +