From ea80847f9697f6b02f9cbaedcafc909e37ce5161 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Harald=20Jens=C3=A5s?= Date: Mon, 18 Mar 2019 18:09:15 +0100 Subject: [PATCH] Remove UndercloudCtlplaneSubnets defaults in UC env MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The defaults in environments/undercloud.yaml will be merged with what the was defined in undercloud.conf. If the 'ctlplane-subnet' is not used in undercloud.conf the default is merged, and we end up with an additional subnet that was not requested by the undercloud installed. This change set the default to {} in: environments/undercloud.yaml Also add's a comment to hightlight that there should be a empty dict default. Closes-Bug: #1820330 Change-Id: Idc17154b2e1e143ba4e84b9b96f5355fc9230172 --- environments/undercloud.yaml | 24 ++++++++++++------- ...bnet-defaults-merged-5a6061b29618f5cf.yaml | 9 +++++++ 2 files changed, 25 insertions(+), 8 deletions(-) create mode 100644 releasenotes/notes/fix-uc-ctlplane-subnet-defaults-merged-5a6061b29618f5cf.yaml diff --git a/environments/undercloud.yaml b/environments/undercloud.yaml index 58506c8217..d460c96efb 100644 --- a/environments/undercloud.yaml +++ b/environments/undercloud.yaml @@ -119,8 +119,8 @@ parameter_defaults: IronicForcePowerStateDuringSync: false IronicInspectorCollectors: default,extra-hardware,numa-topology,logs IronicInspectorInterface: br-ctlplane - IronicInspectorSubnets: - - ip_range: '192.168.24.100,192.168.24.200' + # IronicInspectorSubnets: + # - ip_range: '192.168.24.100,192.168.24.200' IronicProvisioningNetwork: 'ctlplane' IronicRescuingNetwork: 'ctlplane' ZaqarMessageStore: 'swift' @@ -155,12 +155,20 @@ parameter_defaults: # - ip_netmask: 192.168.26.0/24 # next_hop: 192.168.24.1 ControlPlaneStaticRoutes: [] - UndercloudCtlplaneSubnets: - ctlplane-subnet: - NetworkCidr: '192.168.24.0/24' - NetworkGateway: '192.168.24.1' - DhcpRangeStart: '192.168.24.5' - DhcpRangeEnd: '192.168.24.24' + # A dictionary of Undercloud ctlplane subnets. + # NOTE(hjensas): This should be {} in this environment file, otherwise it may + # results in values set here being merged with the values set in + # undercloud.conf. See Bug: https://bugs.launchpad.net/tripleo/+bug/1820330 + # Example: + # UndercloudCtlplaneSubnets: + # ctlplane-subnet: + # NetworkCidr: '192.168.24.0/24' + # NetworkGateway: '192.168.24.1' + # DhcpRangeStart: '192.168.24.5' + # DhcpRangeEnd: '192.168.24.24' + # HostRoutes: + # - {'destination': '10.10.10.0/24', 'nexthop': '192.168.24.254'} + UndercloudCtlplaneSubnets: {} UndercloudCtlplaneLocalSubnet: 'ctlplane-subnet' MistralDockerGroup: true PasswordAuthentication: 'yes' diff --git a/releasenotes/notes/fix-uc-ctlplane-subnet-defaults-merged-5a6061b29618f5cf.yaml b/releasenotes/notes/fix-uc-ctlplane-subnet-defaults-merged-5a6061b29618f5cf.yaml new file mode 100644 index 0000000000..d55d2db93d --- /dev/null +++ b/releasenotes/notes/fix-uc-ctlplane-subnet-defaults-merged-5a6061b29618f5cf.yaml @@ -0,0 +1,9 @@ +--- +fixes: + - | + Fixes an issue that caused a subnet to be wrongly created on the Undercloud + provisioning network based on environment default values. If the default + ``ctlplane-subnet`` was renamed in ``undercloud.conf``, the defaults for + ``ctlplane-subnet`` in ``environments/undercloud.yaml`` was merged with the + subnets defined in ``undercloud.conf``. See `bug 1820330 + `_.