dell · abhishek-sa1 · Aug 12, 2026 · Aug 5, 2026 · Aug 5, 2026 · Aug 5, 2026
diff --git a/.gitattributes b/.gitattributes
@@ -1,2 +1,3 @@
 *.yml linguist-detectable
 *.tar.gz filter=lfs diff=lfs merge=lfs -text
+prepare_oim/roles/deploy_containers/openchami/files/*.tar.gz filter=lfs diff=lfs merge=lfs -text
diff --git a/.github/workflows/ansible-lint.yml b/.github/workflows/ansible-lint.yml
@@ -6,11 +6,7 @@ on:
       - main
       - staging
       - release_1.7.1
-      - pub/build_stream
-      - pub/q2_dev
-      - pub/telemetry
-      - pub/q2_upgrade
-      - pub/q2_ansible
+      - pub/omnia_2.2.0.0_fix
 
 jobs:
   build:

diff --git a/.github/workflows/pylint.yml b/.github/workflows/pylint.yml
@@ -6,11 +6,7 @@ on:
       - main
       - staging
       - release_1.7.1
-      - pub/build_stream
-      - pub/q2_dev
-      - pub/telemetry
-      - pub/q2_upgrade
-      - pub/q2_ansible
+      - pub/omnia_2.2.0.0_fix
 
 jobs:
   build:

diff --git a/build_image_x86_64/roles/image_creation/templates/images/rhel-base-config.yaml.j2 b/build_image_x86_64/roles/image_creation/templates/images/rhel-base-config.yaml.j2
@@ -13,7 +13,7 @@ repos:
 {% if repo.base_url | length > 1 %}
   - alias: '{{ repo.name }}'
     url: '{{ repo.base_url }}'
-{% if repo.priority is defined %}
+{% if repo.priority is defined and repo.priority | string | length > 0 %}
     priority: '{{ repo.priority }}'
 {% endif %}
 {% endif %}

diff --git a/build_image_x86_64/roles/image_creation/templates/images/rhel-compute-config.yaml.j2 b/build_image_x86_64/roles/image_creation/templates/images/rhel-compute-config.yaml.j2
@@ -18,7 +18,7 @@ repos:
 {% if repo.base_url | length > 1 %}
   - alias: '{{ repo.name }}'
     url: '{{ repo.base_url }}'
-{% if repo.priority is defined %}
+{% if repo.priority is defined and repo.priority | string | length > 0 %}
     priority: '{{ repo.priority }}'
 {% endif %}
 {% endif %}

diff --git a/common/library/module_utils/input_validation/common_utils/en_us_validation_msg.py b/common/library/module_utils/input_validation/common_utils/en_us_validation_msg.py
@@ -702,11 +702,6 @@ def tls_ext_fail_msg(valid_extensions):
     "build_stream_config.yml file is empty or has syntax errors. "
     "It must contain valid YAML with 'enable_build_stream' field."
 )
-AARCH64_INVENTORY_HOST_IP_INVALID_SUBNET_MSG = (
-    "Field 'aarch64_inventory_host_ip' must be in the same subnet as OIM admin IP. "
-    "Check network_spec.yml for admin network configuration."
-)
-
 AARCH64_INVENTORY_HOST_IP_REQUIRED_MSG = (
     "Field 'aarch64_inventory_host_ip' is required when PXE mapping file "
     "contains aarch64 functional groups. Provide the admin IP of the "

diff --git a/common/library/module_utils/input_validation/schema/local_repo_config.json b/common/library/module_utils/input_validation/schema/local_repo_config.json
@@ -83,7 +83,8 @@
           "name": {
             "type": "string",
             "minLength": 1,
-            "pattern": "^(?!\\s*$).+"
+            "maxLength": 64,
+            "pattern": "^[A-Za-z0-9._-]+$"
           },
           "policy": {
             "type": "string",
@@ -219,7 +220,8 @@
           "name": {
             "type": "string",
             "minLength": 1,
-            "pattern": "^(?!\\s*$).+"
+            "maxLength": 64,
+            "pattern": "^[A-Za-z0-9._-]+$"
           },
           "policy": {
             "type": "string",
@@ -355,7 +357,8 @@
           "name": {
             "type": "string",
             "minLength": 1,
-            "pattern": "^(?!\\s*$).+"
+            "maxLength": 64,
+            "pattern": "^[A-Za-z0-9._-]+$"
           },
           "policy": {
             "type": "string",
@@ -491,7 +494,8 @@
           "name": {
             "type": "string",
             "minLength": 1,
-            "pattern": "^(?!\\s*$).+"
+            "maxLength": 64,
+            "pattern": "^[A-Za-z0-9._-]+$"
           },
           "policy": {
             "type": "string",
@@ -644,7 +648,8 @@
           },
           "name": {
             "type": "string",
-            "pattern": "^(?!\\s*$).+",
+            "pattern": "^[A-Za-z0-9._-]+$",
+            "maxLength": 64,
             "minLength": 1
           },
           "policy": {
@@ -780,7 +785,8 @@
           },
           "name": {
             "type": "string",
-            "pattern": "^(?!\\s*$).+",
+            "pattern": "^[A-Za-z0-9._-]+$",
+            "maxLength": 64,
             "minLength": 1
           },
           "policy": {
@@ -898,7 +904,8 @@
           },
           "name": {
             "type": "string",
-            "pattern": "^(?!\\s*$).+",
+            "pattern": "^[A-Za-z0-9._-]+$",
+            "maxLength": 64,
             "minLength": 1
           },
           "sslcacert": {
@@ -1027,7 +1034,8 @@
           },
           "name": {
             "type": "string",
-            "pattern": "^(?!\\s*$).+",
+            "pattern": "^[A-Za-z0-9._-]+$",
+            "maxLength": 64,
             "minLength": 1
           },
           "sslcacert": {
@@ -1157,7 +1165,8 @@
           "name": {
             "type": "string",
             "minLength": 1,
-            "pattern": "^(?!\\s*$).+"
+            "maxLength": 64,
+            "pattern": "^[A-Za-z0-9._-]+$"
           },
           "policy": {
             "type": "string",
@@ -1215,7 +1224,8 @@
           "name": {
             "type": "string",
             "minLength": 1,
-            "pattern": "^(?!\\s*$).+"
+            "maxLength": 64,
+            "pattern": "^[A-Za-z0-9._-]+$"
           },
           "policy": {
             "type": "string",

diff --git a/common/library/module_utils/input_validation/validation_flows/build_stream_validation.py b/common/library/module_utils/input_validation/validation_flows/build_stream_validation.py
@@ -273,19 +273,6 @@ def validate_build_stream_config(input_file_path, data,
                                           "Invalid IPv4 address format"))
             return errors
 
-        # Check if it's in the same subnet as admin IP
-        try:
-            admin_network = ipaddress.IPv4Network(f"{admin_ip}/{netmask_bits}", strict=False)
-
-            if aarch64_ip not in admin_network:
-                errors.append(create_error_msg(
-                    build_stream_yml,
-                    "aarch64_inventory_host_ip",
-                    msg.AARCH64_INVENTORY_HOST_IP_INVALID_SUBNET_MSG
-                ))
-        except ValueError as e:
-            logger.error("Failed to validate subnet for aarch64_inventory_host_ip: %s", str(e))
-
         # Check aarch64 host IP reachability using socket (safer than subprocess)
         try:
             # Try to connect to SSH port which is usually open on inventory hosts

diff --git a/common/library/module_utils/local_repo/parse_and_download.py b/common/library/module_utils/local_repo/parse_and_download.py
@@ -21,6 +21,7 @@
 
 import os
 import subprocess
+import shlex
 import json
 import re
 from multiprocessing import Lock
@@ -57,12 +58,13 @@ def execute_command(cmd_string, logger, type_json=False):
         logger.info(f"Executing command: {safe_cmd_string}")
 
         # Run the command
+        cmd_list = shlex.split(cmd_string)
         cmd = subprocess.run(
-            cmd_string,
+            cmd_list,
             universal_newlines=True,
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
-            shell=True,
+            shell=False,
         )
         status["returncode"] = cmd.returncode
         status["stdout"] = cmd.stdout.strip() if cmd.stdout else None

diff --git a/common/library/modules/pulp_cleanup.py b/common/library/modules/pulp_cleanup.py
@@ -29,6 +29,7 @@
 import json
 import shutil
 import subprocess
+import shlex
 import re
 import yaml
 from typing import Dict, List, Any, Tuple
@@ -92,7 +93,8 @@ def format_pretty_table(results: List[Dict[str, Any]]) -> str:
 def run_cmd(cmd: str, logger) -> Dict[str, Any]:
     """Execute shell command and return result."""
     try:
-        result = subprocess.run(cmd, shell=True, capture_output=True, text=True, timeout=300)
+        cmd_list = shlex.split(cmd)
+        result = subprocess.run(cmd_list, shell=False, capture_output=True, text=True, timeout=300)
         return {"rc": result.returncode, "stdout": result.stdout, "stderr": result.stderr}
     except (subprocess.SubprocessError, OSError) as e:
         logger.error(f"Command failed: {cmd} - {e}")

diff --git a/common/library/modules/pulp_pgsql_backup_restore.py b/common/library/modules/pulp_pgsql_backup_restore.py
@@ -20,7 +20,7 @@
 
 Handles the PostgreSQL version incompatibility between Pulp versions:
   - Pulp 3.80 uses PostgreSQL 12/13
-  - Pulp 3.113 uses PostgreSQL 16
+  - Pulp 3.114.2 uses PostgreSQL 16
 
 Backup (action=backup):
   - Validates source PostgreSQL data exists

diff --git a/common/vars/image_vars.yml b/common/vars/image_vars.yml
@@ -16,10 +16,10 @@
 # Usage: get_container_image_list.yml
 container_tag: "latest"
 squid_tag: "6.6-24.04_beta"
-pulp_tag: "3.113"
-mysql_tag: "9.3.0"
+pulp_tag: "3.114.2"
+mysql_tag: "9.7.2"
 prometheus_tag: "v3.4.1"
-activemq_tag: "5.19.7"
+activemq_tag: "6.3.0"
 grafana_image_tag: "12.0.1"
 loki_image_tag: "3.5.1"
 promtail_image_tag: "3.5.1"