Skip to content

Feature branch sync - pub/q2_dev to pub/q2_upgrade#4409

Merged
abhishek-sa1 merged 6 commits into
pub/q2_upgradefrom
pub/q2_dev
May 13, 2026
Merged

Feature branch sync - pub/q2_dev to pub/q2_upgrade#4409
abhishek-sa1 merged 6 commits into
pub/q2_upgradefrom
pub/q2_dev

Conversation

@abhishek-sa1
Copy link
Copy Markdown
Collaborator

Feature branch sync - pub/q2_dev to pub/q2_upgrade

priti-parate and others added 6 commits May 11, 2026 11:22
Add optional additional_subnets configuration under admin_network in
network_spec.yml to support multi-RAC / multi-subnet PXE deployments
with CoreDHCP relay (giaddr-based routing).

Changes:
- network_spec.yml: add additional_subnets field with documentation
- network_spec.json: JSON schema validation for subnet entries
- en_us_validation_msg.py: error messages for subnet validation
- provision_validation.py: validate CIDRs, routers, ranges, overlaps
- configs.yaml.j2: emit coredhcp_subnets/coredhcp_subnet_pools vars
- coredhcp.yaml.j2: dual-mode template (positional args for v0.4.x,
  key=value format with subnet=/subnet_pool= for multi-subnet)
- deploy_openchami.yml: overlay coredhcp template after clone
- vars/main.yml: add template path variables
- test_additional_subnets_validation.py: 17 unit tests

Single-subnet (flat) deployments continue to use the original
positional-argument config format compatible with coresmd v0.4.x.
Multi-subnet requires coresmd with multi-subnet support (PR #61).

Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>
Signed-off-by: Sujit Jadhav <sujit.jadhav@dell.com>
Co-authored-by: Abhishek S A <abhishek.sa3@dell.com>
Signed-off-by: balajikumaran.cs <balajikumaran.c.s@gmail.com>
* vector ldms configuration and deployment

* vector updates

* vector-ldms metrics chnages and image change

* Update telemetry_prereq.yml

Signed-off-by: Kratika Patidar <Kratika.Patidar@dell.com>

* Set changed_when to false for telemetry deployment

Prevent change detection for telemetry deployment.

Signed-off-by: Kratika Patidar <Kratika.Patidar@dell.com>

* vecotr-ldms review comments

* lint-fix

* LDMS-Vector deployment (#4330)

* vector ldms configuration and deployment

* vector updates

* vector-ldms metrics chnages and image change

* Update telemetry_prereq.yml

Signed-off-by: Kratika Patidar <Kratika.Patidar@dell.com>

* Set changed_when to false for telemetry deployment

Prevent change detection for telemetry deployment.

Signed-off-by: Kratika Patidar <Kratika.Patidar@dell.com>

* vecotr-ldms review comments

* lint-fix

---------

Signed-off-by: Kratika Patidar <Kratika.Patidar@dell.com>

* Update main.yml

Signed-off-by: Kratika Patidar <Kratika.Patidar@dell.com>

* Update telemetry.sh.j2

Signed-off-by: Kratika Patidar <Kratika.Patidar@dell.com>

* conflict resolve

* conflict fix

* vector ome metrics changes

* Vector-OME deploymenet (#4394)

* conflict resolve

* conflict fix

* vector ome metrics changes

* Update vmagent-scrape-config.yaml.j2

---------

Signed-off-by: Kratika Patidar <Kratika.Patidar@dell.com>
Signed-off-by: sakshi-singla-1735 <sakshi.s@dell.com>
Co-authored-by: Abhishek S A <abhishek.sa3@dell.com>
Co-authored-by: mcas <sakshi.s@dell.com>
Co-authored-by: Jagadeesh N V <39791839+jagadeeshnv@users.noreply.github.com>
Co-authored-by: priti-parate <140157516+priti-parate@users.noreply.github.com>
Co-authored-by: Jagadeesh N V <jagadeesh_n_v@dell.com>
Co-authored-by: Sujit Jadhav <sujit.jadhav@dell.com>
defect fixes and merge conflict issues
---------

Signed-off-by: priti-parate <140157516+priti-parate@users.noreply.github.com>
@abhishek-sa1 abhishek-sa1 marked this pull request as ready for review May 13, 2026 05:26
@abhishek-sa1 abhishek-sa1 merged commit dd63d04 into pub/q2_upgrade May 13, 2026
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants