From 92db9f6568197daaaea884a3617892bf410e54aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Harald=20Jens=C3=A5s?= Date: Tue, 10 Dec 2024 15:46:07 +0100 Subject: [PATCH 1/2] Set the IP ranges for Ironic Inspector DHCP service This is using static hostnames to give separate ranges for the 3 OSP controllers. To have the predictable node name the ci-framework must run with a static "run_id" i.e `cifmw_run_id: uni01alpha` must be set in the scenario env. Also set the IronicInspectorInterface to `br-baremetal` --- scenarios/uni01alpha/config_download.yaml | 11 +++++++++++ scenarios/uni01alpha/network_data.yaml.j2 | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/scenarios/uni01alpha/config_download.yaml b/scenarios/uni01alpha/config_download.yaml index 9dff56828..b8af87288 100644 --- a/scenarios/uni01alpha/config_download.yaml +++ b/scenarios/uni01alpha/config_download.yaml @@ -79,3 +79,14 @@ parameter_defaults: host_routes: [] name: ctlplane-subnet ip_version: 4 + IronicInspectorInterface: br-baremetal + # Since we need predictable node names to be able to set this paremeter, + # it a requirement to set the ci-framework parameter cifmw_run_id with + # this value 'uni01alpha'. + IronicInspectorSubnets: + osp-controller-uni01alpha-0: + - ip_range: 172.20.0.210,172.20.0.219 + osp-controller-uni01alpha-1: + - ip_range: 172.20.0.220,172.20.0.229 + osp-controller-uni01alpha-2: + - ip_range: 172.20.0.230,172.20.0.239 diff --git a/scenarios/uni01alpha/network_data.yaml.j2 b/scenarios/uni01alpha/network_data.yaml.j2 index d61a74d2d..f97a028eb 100644 --- a/scenarios/uni01alpha/network_data.yaml.j2 +++ b/scenarios/uni01alpha/network_data.yaml.j2 @@ -55,5 +55,5 @@ ironic_subnet: ip_subnet: 172.20.0.0/24 allocation_pools: - - start: 172.20.0.200 - end: 172.20.0.250 + - start: 172.20.0.150 + end: 172.20.0.200 From 5a3c7b421ec7894720beaeabec38b4d141abf20f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Harald=20Jens=C3=A5s?= Date: Thu, 12 Dec 2024 19:55:25 +0100 Subject: [PATCH 2/2] Align ironic network IP range to uni01alpha --- scenarios/uni01alpha/config_download.yaml | 6 +++--- scenarios/uni01alpha/network_data.yaml.j2 | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scenarios/uni01alpha/config_download.yaml b/scenarios/uni01alpha/config_download.yaml index b8af87288..300734fa6 100644 --- a/scenarios/uni01alpha/config_download.yaml +++ b/scenarios/uni01alpha/config_download.yaml @@ -85,8 +85,8 @@ parameter_defaults: # this value 'uni01alpha'. IronicInspectorSubnets: osp-controller-uni01alpha-0: - - ip_range: 172.20.0.210,172.20.0.219 + - ip_range: 172.20.1.210,172.20.1.219 osp-controller-uni01alpha-1: - - ip_range: 172.20.0.220,172.20.0.229 + - ip_range: 172.20.1.220,172.20.1.229 osp-controller-uni01alpha-2: - - ip_range: 172.20.0.230,172.20.0.239 + - ip_range: 172.20.1.230,172.20.1.239 diff --git a/scenarios/uni01alpha/network_data.yaml.j2 b/scenarios/uni01alpha/network_data.yaml.j2 index f97a028eb..519c82135 100644 --- a/scenarios/uni01alpha/network_data.yaml.j2 +++ b/scenarios/uni01alpha/network_data.yaml.j2 @@ -53,7 +53,7 @@ dns_domain: ironic.{{ cloud_domain }}. subnets: ironic_subnet: - ip_subnet: 172.20.0.0/24 + ip_subnet: 172.20.1.0/24 allocation_pools: - - start: 172.20.0.150 - end: 172.20.0.200 + - start: 172.20.1.150 + end: 172.20.1.200