openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Ironic Inspector - disjoint ip range(s) for HA"

This commit is contained in:
Zuul 2018-12-14 01:44:47 +00:00 committed by Gerrit Code Review
parent 6454b7d2a8 2024bb0218
commit f520c3bd99
2 changed files with 45 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
puppet/services/ironic-inspector.yaml
View File

@ -106,6 +106,25 @@ parameters:
netmask: 255.255.255.0
gateway: 192.168.1.254
tag: subnet1
NOTE: For HA deployments use disjoint address pools to avoid potential
address conflict. Use the hostname (short form) of each instance
that will run Ironic Inspector and define a dictionary with the
disjoint ip ranges.
Example HA deployment using disjoint address pools:
overcloud-ironic-0:
- ip_range: 192.168.24.100,192.168.24.119
- ip_range: 192.168.25.100,192.168.25.119
netmask: 255.255.255.0
gateway: 192.168.25.254
tag: subnet1
overcloud-ironic-1:
- ip_range: 192.168.24.120,192.168.24.139
- ip_range: 192.168.25.120,192.168.25.139
netmask: 255.255.255.0
gateway: 192.168.25.254
tag: subnet1
type: json
default: {}
IronicInspectorUseSwift:
@ -152,7 +171,7 @@ outputs:
"%{hiera('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, IronicInspectorNetwork]}
ironic::inspector::dnsmasq_ip_subnets:
tripleo::profile::base::ironic_inspector::inspection_subnets:
if:
- ironic_inspection_subnets_not_set
- [{ip_range: {get_param: IronicInspectorIpRange}}]

25
releasenotes/notes/ironic-inspector-disjoint-inspection-ip-range-f399a938d50daadd.yaml Normal file
View File

@ -0,0 +1,25 @@
---
features:
- |
Adds support to configure disjoint address pools for Ironic Inspector.
When Inspector is deployed as a HA service disjoint address pools should be
served by the DHCP instances to avoid address conflict issues. The disjoint
address pools are configured by using hostname (short form) as the key,
then pass the list of ranges for each host. For example::
parameter_defaults:
IronicInspectorSubnets:
overcloud-ironic-0:
- ip_range: 192.168.24.100,192.168.24.119
- ip_range: 192.168.25.100,192.168.25.119
netmask: 255.255.255.0
gateway: 192.168.25.254
tag: subnet1
overcloud-ironic-1:
- ip_range: 192.168.24.120,192.168.24.139
- ip_range: 192.168.25.120,192.168.25.139
netmask: 255.255.255.0
gateway: 192.168.25.254
tag: subnet1