Remove UndercloudCtlplaneSubnets defaults in UC env

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
(cherry picked from commit ea80847f96)
This commit is contained in:
Harald Jensås 2019-03-18 18:09:15 +01:00
parent 8b49052e3f
commit 50063195eb
2 changed files with 25 additions and 8 deletions

View File

@ -107,8 +107,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'
@ -142,12 +142,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'

View File

@ -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
<https://bugs.launchpad.net/tripleo/+bug/1820330>`_.