Feature branch sync - pub/q2_dev to pub/build_stream

build_image_x86_64/roles/fetch_packages/vars/main.yml

@@ -23,8 +23,9 @@ functional_groups_file_path: "{{ hostvars['localhost']['functional_groups_config
 software_config_file_path: "{{ input_project_dir }}/software_config.json"
 x86_64_build_image_completion_msg: |
   The playbook build_image_x86_64.yml has been completed successfully.
-  To boot x86_64 nodes execute discovery/discovery.yml playbook.
   To build image for aarch64 nodes execute build_image_aarch64/build_image_aarch64.yml playbook.
+  To boot x86_64 nodes execute provision/provision.yml playbook.
+
 functional_group_absent_msg: |
   Failure: No x86_64 functional groups found in functional_group_config.yml input file.
   Please make sure x86_64 functional_group should be present in input file functional_group_config.yml

common/library/module_utils/input_validation/common_utils/config.py

@@ -58,7 +58,8 @@
     "telemetry_config": "telemetry_config.yml",
     "high_availability_config": "high_availability_config.yml",
     "build_stream_config": "build_stream_config.yml",
-    "gitlab_config": "gitlab_config.yml"
+    "gitlab_config": "gitlab_config.yml",
+    "discovery_config": "discovery_config.yml"
     # "additional_software": "additional_software.json"
 }
 
@@ -103,6 +104,7 @@
     # "high_availability": [files["high_availability_config"]],
     # "additional_software": [files["additional_software"]],
     "build_stream": [files["build_stream_config"]],
+    "discovery": [files["discovery_config"]],
     "gitlab": [files["gitlab_config"], files["build_stream_config"]],
     "all": [
         files["local_repo_config"],

common/library/module_utils/input_validation/common_utils/logical_validation.py

@@ -25,6 +25,7 @@
 from ansible.module_utils.input_validation.validation_flows import local_repo_validation
 from ansible.module_utils.input_validation.validation_flows import build_stream_validation
 from ansible.module_utils.input_validation.validation_flows import gitlab_validation
+from ansible.module_utils.input_validation.validation_flows import telemetry_validation
 
 
 # L2 Validation Code - validate anything that could not have been validated with JSON schema
@@ -61,7 +62,7 @@ def validate_input_logic(
         "network_spec.yml": provision_validation.validate_network_spec,
         "omnia_config.yml": common_validation.validate_omnia_config,
         "local_repo_config.yml": local_repo_validation.validate_local_repo_config,
-        "telemetry_config.yml": common_validation.validate_telemetry_config,
+        "telemetry_config.yml": telemetry_validation.validate_telemetry_config,
         "security_config.yml": common_validation.validate_security_config,
         "storage_config.yml": common_validation.validate_storage_config,
         "high_availability_config.yml":

common/library/module_utils/input_validation/schema/discovery_config.json

@@ -0,0 +1,38 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "Discovery Configuration",
+  "type": "object",
+  "properties": {
+    "enable_bmc_discovery": {
+      "type": "boolean",
+      "description": "Enable BMC discovery via OME. When true, ome_ip must be a valid IP address."
+    },
+    "ome_ip": {
+      "type": "string",
+      "description": "IP address of the Dell OpenManage Enterprise (OME) instance."
+    }
+  },
+  "required": [
+    "enable_bmc_discovery",
+    "ome_ip"
+  ],
+  "allOf": [
+    {
+      "if": {
+        "properties": {
+          "enable_bmc_discovery": { "const": true }
+        }
+      },
+      "then": {
+        "properties": {
+          "ome_ip": {
+            "type": "string",
+            "minLength": 7,
+            "pattern": "^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$",
+            "errorMessage": "ome_ip must be a valid IPv4 address when enable_bmc_discovery is true. Example: 192.168.1.100"
+          }
+        }
+      }
+    }
+  ]
+}

common/library/module_utils/input_validation/schema/network_spec.json

@@ -124,6 +124,22 @@
                   "netmask_bits": {
                     "type": "string",
                     "pattern": "^(1[0-9]|2[0-9]|[1-9])$|^3[0-2]$"
+                  },
+                  "dns": {
+                    "oneOf": [
+                      {
+                        "type": "array",
+                        "maxItems": 0
+                      },
+                      {
+                        "type": "array",
+                        "minItems": 1,
+                        "items": {
+                          "type": "string",
+                          "pattern": "^(?:(?:25[0-5]|2[0-4][0-9]|1?[0-9]{1,2})\\.){3}(?:25[0-5]|2[0-4][0-9]|1?[0-9]{1,2})$"
+                        }
+                      }
+                    ]
                   }
                 },
                 "additionalProperties": false

common/library/module_utils/input_validation/schema/omnia_config.json

@@ -138,7 +138,66 @@
             "description": "File path for the values.yaml file.",
             "type": "string",
             "pattern": "^(|/?([a-zA-Z0-9._-]+/)*[a-zA-Z0-9._-]+\\.yaml)$"
-
+          },
+          "powerscale_authorization": {
+            "type": "object",
+            "description": "PowerScale CSM Authorization configuration for multi-tenancy.",
+            "properties": {
+              "enabled": {
+                "type": "boolean",
+                "description": "Enable PowerScale CSM Authorization for multi-tenant storage."
+              },
+              "csm_authorization_values_file_path": {
+                "description": "Absolute file path for the CSM Authorization values.yaml file.",
+                "type": "string",
+                "pattern": "^(|/?([a-zA-Z0-9._-]+/)*[a-zA-Z0-9._-]+\\.yaml)$"
+              },
+              "tenants": {
+                "type": ["array", "null"],
+                "description": "List of tenant configurations.",
+                "items": {
+                  "type": "object",
+                  "properties": {
+                    "name": {
+                      "type": ["string", "null"],
+                      "minLength": 1,
+                      "pattern": "^[a-zA-Z0-9_-]+$",
+                      "description": "Tenant name (alphanumeric, hyphens, underscores only)."
+                    },
+                    "roles": {
+                      "type": ["array", "null"],
+                      "default": [],
+                      "description": "List of roles for this tenant.",
+                      "items": {
+                        "type": "object",
+                        "properties": {
+                          "name": {
+                            "type": ["string", "null"],
+                            "minLength": 1,
+                            "pattern": "^[a-zA-Z0-9_-]+$",
+                            "description": "Role name (alphanumeric, hyphens, underscores only)."
+                          },
+                          "storage_pool": {
+                            "type": ["string", "null"],
+                            "minLength": 1,
+                            "pattern": "^/ifs(/[a-zA-Z0-9._-]+)+$",
+                            "description": "PowerScale storage pool path (must start with /ifs and exist on PowerScale)."
+                          },
+                          "quota_limit": {
+                            "type": ["string", "null"],
+                            "pattern": "^[1-9][0-9]*(Gi|Ti|Mi)$",
+                            "description": "Storage quota limit (e.g., 200Gi, 1Ti, 500Mi)."
+                          }
+                        },
+                        "required": ["name", "storage_pool", "quota_limit"]
+                      }
+                    }
+                  },
+                  "required": ["name"]
+                }
+              }
+            },
+            "required": ["enabled"]
           },
           "k8s_crio_storage_size": {
             "description": "Storage size for CRI-O in Gigabytes only (example: 10G, 15G, 100G)",
@@ -166,6 +225,33 @@
           "then": {
             "required": ["csi_powerscale_driver_values_file_path"]
           }
+        },
+        {
+          "if": {
+            "properties": {
+              "powerscale_authorization": {
+                "type": "object",
+                "properties": {
+                  "enabled": {
+                    "const": true
+                  }
+                },
+                "required": ["enabled"]
+              }
+            },
+            "required": ["powerscale_authorization"]
+          },
+          "then": {
+            "required": [
+              "csi_powerscale_driver_secret_file_path",
+              "csi_powerscale_driver_values_file_path"
+            ],
+            "properties": {
+              "powerscale_authorization": {
+                "required": ["csm_authorization_values_file_path", "tenants"]
+              }
+            }
+          }
         }
       ]
       }