openstack
/
puppet-tripleo
Code Issues Proposed changes

Ironic Inspector - disjoint ip range(s) for HA 

Allow tht parameter IronicInspectorSubnets to specify
per-instance ip range(s) using hostname as key for each
list of ip ranges. For HA deployments use disjoint
address pools to avoid potential address conflict.

Implements: blueprint ironic-inspector-overcloud
Change-Id: Ifae513265b8c35d98012f14f951bac33ae90b66c
(cherry picked from commit c2d84b4fee)
This commit is contained in:
Harald Jensås 2018-03-28 19:58:23 +02:00
parent 8fe6ba72d3
commit fa04ef8fda
2 changed files with 53 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
manifests/profile/base/ironic_inspector.pp
View File

@ -18,6 +18,33 @@
#
# === Parameters
#
# [*inspection_subnets*]
# IP ranges that will be given to nodes during the inspection
# process. Either a list of ip ranged or a dictionary with $::hostname as
# key to enable HA deployments using disjoint address pools served by the
# DHCP instances.
#
# Example for Non-HA deployment, a list of ip-ranges:
# - ip_range: 192.168.0.100,192.168.0.120
# - ip_range: 192.168.1.100,192.168.1.200
# netmask: 255.255.255.0
# gateway: 192.168.1.254
# tag: subnet1
#
# Example for 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
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('bootstrap_nodeid')
@ -27,8 +54,9 @@
# Defaults to hiera('step')
class tripleo::profile::base::ironic_inspector (
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$step = Integer(hiera('step')),
$inspection_subnets = [],
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$step = Integer(hiera('step')),
) {
if $::hostname == downcase($bootstrap_node) {
@ -37,10 +65,25 @@ class tripleo::profile::base::ironic_inspector (
$sync_db = false
}
if is_hash($inspection_subnets) {
$inspection_subnets_real = $inspection_subnets[$::hostname]
} elsif is_array($inspection_subnets) {
$inspection_subnets_real = $inspection_subnets
}
if $step >= 4 or ($step >= 3 and $sync_db) {
include ::ironic::inspector::cors
class { '::ironic::inspector':
sync_db => $sync_db,
# TODO(hjensas): Once https://review.openstack.org/557465 is merged remove
# the condition.
if $inspection_subnets != [] {
class { '::ironic::inspector':
sync_db => $sync_db,
dnsmasq_ip_subnets => $inspection_subnets_real,
}
} else {
class { '::ironic::inspector':
sync_db => $sync_db,
}
}
include ::ironic::inspector::pxe_filter

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

@ -0,0 +1,6 @@
---
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.