updated

Signed-off-by: Harika <codewith3@gmail.com>

Author: xkd9

core/lib/system/precheck/read-config-file.sh

@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 # Copyright (C) 2025-2026 Intel Corporation
-=======
-# Copyright (C) 2024-2025 Intel Corporation
->>>>>>> dell-deploy-1.4-nv
 # SPDX-License-Identifier: Apache-2.0
 
 read_config_file() {
@@ -67,13 +63,9 @@ read_config_file() {
         case "$cpu_or_gpu" in
             "c" | "cpu")
             cpu_or_gpu="c"
-<<<<<<< HEAD
-            deploy_habana_ai_operator="no"
-=======
             gpu_vendor=""
             deploy_habana_ai_operator="no"
             deploy_nvidia_operator="no"
->>>>>>> dell-deploy-1.4-nv
             ;;
             "g" | "gpu" | "gaudi2" | "gaudi3")
             if [[ "$cpu_or_gpu" == "gaudi2" || "$cpu_or_gpu" == "gpu" || "$cpu_or_gpu" == "g" ]]; then
@@ -83,12 +75,6 @@ read_config_file() {
                 gaudi_platform="gaudi3"
             fi
             cpu_or_gpu="g"
-<<<<<<< HEAD
-            deploy_habana_ai_operator="yes"            
-            ;;
-            *)
-            echo "Invalid value for cpu_or_gpu. It should be 'c' or 'cpu' for CPU, or 'g', 'gpu', 'gaudi2', or 'gaudi3' for GPU."
-=======
             gpu_vendor="gaudi"
             deploy_habana_ai_operator="yes"            
             deploy_nvidia_operator="no"
@@ -101,7 +87,6 @@ read_config_file() {
             ;;
             *)
             echo "Invalid value for cpu_or_gpu. It should be 'c' or 'cpu' for CPU, or 'g', 'gpu', 'gaudi2', 'gaudi3', or 'nv-gpu' for GPU."
->>>>>>> dell-deploy-1.4-nv
             exit 1
             ;;
         esac

core/lib/system/precheck/readiness-check.sh

@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 # Copyright (C) 2025-2026 Intel Corporation
-=======
-# Copyright (C) 2024-2025 Intel Corporation
->>>>>>> dell-deploy-1.4-nv
 # SPDX-License-Identifier: Apache-2.0
 
 run_infrastructure_readiness_check() {
@@ -14,19 +10,11 @@ run_infrastructure_readiness_check() {
         echo -e "${YELLOW}Please ensure the inventory file exists and contains the correct host information.${NC}"
         return 1
     fi    
-<<<<<<< HEAD
-    if ansible-playbook -i "${INVENTORY_PATH}" --become --become-user=root --extra-vars "brownfield_deployment=true" playbooks/inference-precheck.yml; then
-=======
     if ansible-playbook -i "${INVENTORY_PATH}" --become --become-user=root --become-password-file="${BECOME_PASSWORD_FILE}" --extra-vars "brownfield_deployment=true" playbooks/inference-precheck.yml; then
->>>>>>> dell-deploy-1.4-nv
         echo -e "${GREEN}Infrastructure readiness check completed successfully.${NC}"
         return 0
     else
         echo -e "${RED}Infrastructure readiness check failed. Please resolve the issues before proceeding.${NC}"
         return 1
     fi
-<<<<<<< HEAD
 }
-=======
-}
->>>>>>> dell-deploy-1.4-nv

core/lib/system/setup-env.sh

@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 # Copyright (C) 2025-2026 Intel Corporation
-=======
-# Copyright (C) 2024-2025 Intel Corporation
->>>>>>> dell-deploy-1.4-nv
 # SPDX-License-Identifier: Apache-2.0
 
 setup_initial_env() {
@@ -45,11 +41,7 @@ setup_initial_env() {
     fi
 
     VENVDIR="$KUBESPRAYDIR/venv"
-<<<<<<< HEAD
-    REMOTEDIR="/tmp/helm-charts"    
-=======
     REMOTEDIR="$KUBESPRAYDIR/helm-charts"    
->>>>>>> dell-deploy-1.4-nv
     if [ ! -d "$VENVDIR" ]; then                
         echo "Installing python3-venv package..."
         if command -v apt &> /dev/null; then            
@@ -78,11 +70,7 @@ setup_initial_env() {
     else
         echo "Virtual environment activated successfully. Path: $VIRTUAL_ENV"
     fi                 
-<<<<<<< HEAD
-        
-=======
 
->>>>>>> dell-deploy-1.4-nv
     export PIP_BREAK_SYSTEM_PACKAGES=1
     $VENVDIR/bin/python3 -m pip install --upgrade pip
     $VENVDIR/bin/python3 -m pip install -U -r requirements.txt    
@@ -107,10 +95,7 @@ setup_initial_env() {
     cp "$HOMEDIR"/playbooks/* "$KUBESPRAYDIR"/playbooks/    
     gaudi2_values_file_path="$REMOTEDIR/vllm/gaudi-values.yaml"
     gaudi3_values_file_path="$REMOTEDIR/vllm/gaudi3-values.yaml"
-<<<<<<< HEAD
-=======
     nvidia_values_file_path="$REMOTEDIR/vllm/nvidia-values.yaml"
->>>>>>> dell-deploy-1.4-nv
     xeon_values_file_path="$REMOTEDIR/vllm/xeon-values.yaml"
     cp "$HOMEDIR"/inventory/metadata/addons.yml $KUBESPRAYDIR/inventory/mycluster/group_vars/k8s_cluster/addons.yml
     cp "$HOMEDIR"/inventory/metadata/all.yml $KUBESPRAYDIR/inventory/mycluster/group_vars/all/all.yml
@@ -174,10 +159,7 @@ setup_initial_env() {
     echo "Infrastructure readiness check completed successfully."    
     gaudi2_values_file_path="$REMOTEDIR/vllm/gaudi-values.yaml"
     gaudi3_values_file_path="$REMOTEDIR/vllm/gaudi3-values.yaml"
-<<<<<<< HEAD
-=======
     nvidia_values_file_path="$REMOTEDIR/vllm/nvidia-values.yaml"
->>>>>>> dell-deploy-1.4-nv
     ansible-galaxy collection install community.kubernetes        
 }
 
@@ -200,8 +182,4 @@ invoke_prereq_workflows() {
 install_ansible_collection() {
     echo "Installing community.general collection..."
     ansible-galaxy collection install community.general
-<<<<<<< HEAD
-}
-=======
 }
->>>>>>> dell-deploy-1.4-nv

core/lib/user-menu/parse-user-prompts.sh

@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 # Copyright (C) 2025-2026 Intel Corporation
-=======
-# Copyright (C) 2024-2025 Intel Corporation
->>>>>>> dell-deploy-1.4-nv
 # SPDX-License-Identifier: Apache-2.0
 
 parse_arguments() {
@@ -34,12 +30,6 @@ prompt_for_input() {
         echo "Proceeding with the setup of Fresh Kubernetes cluster: $deploy_kubernetes_fresh"
     fi
     if [ -z "$deploy_habana_ai_operator" ]; then
-<<<<<<< HEAD
-        read -p "Do you want to proceed with deploying Habana AI Operator? (yes/no): " deploy_habana_ai_operator
-    else
-        echo "Proceeding with the setup of Habana AI Operator: $deploy_habana_ai_operator"
-    fi
-=======
         if [ "$gpu_vendor" == "nvidia" ]; then
             deploy_habana_ai_operator="no"
             echo "Skipping Habana AI Operator for NVIDIA GPU deployment"
@@ -59,7 +49,6 @@ prompt_for_input() {
     else
         echo "Proceeding with the setup of NVIDIA GPU Operator: $deploy_nvidia_operator"
     fi
->>>>>>> dell-deploy-1.4-nv
     if [ -z "$deploy_ingress_controller" ]; then
         read -p "Do you want to proceed with deploying Ingress NGINX Controller? (yes/no): " deploy_ingress_controller
     else

core/playbooks/deploy-genai-gateway.yml

@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 # Copyright (C) 2025-2026 Intel Corporation
-=======
-# Copyright (C) 2024-2025 Intel Corporation
->>>>>>> dell-deploy-1.4-nv
 # SPDX-License-Identifier: Apache-2.0
 ---
 - name: Deploy GenAI Gateway
@@ -190,11 +186,7 @@
               annotations:
                 alb.ingress.kubernetes.io/actions.ssl-redirect: '{"Type": "redirect", "RedirectConfig": { "Protocol": "HTTPS", "Port": "443", "StatusCode": "HTTP_301"}}'
                 alb.ingress.kubernetes.io/certificate-arn: "{{ aws_certificate_arn | default('') }}"
-<<<<<<< HEAD
-                alb.ingress.kubernetes.io/group.name: ei-eks
-=======
                 alb.ingress.kubernetes.io/group.name: eks-genai-trace
->>>>>>> dell-deploy-1.4-nv
                 alb.ingress.kubernetes.io/listen-ports: '[{"HTTP": 80}, {"HTTPS": 443}]'
                 alb.ingress.kubernetes.io/reconcile: now
                 alb.ingress.kubernetes.io/scheme: internet-facing
@@ -236,10 +228,6 @@
         --set langfuse.ingress.className={{ 'alb' if kubernetes_platform == 'eks' else 'nginx' }}
         --set langfuse.ingress.tls.enabled=true
         --set langfuse.ingress.hosts[0].host=trace-{{ secret_name }}
-<<<<<<< HEAD
-        --set langfuse.ingress.hosts[0].paths[0].pathType=Prefix
-=======
->>>>>>> dell-deploy-1.4-nv
         --set langfuse.ingress.tls.secretName=trace-{{ secret_name }}
         --set langfuse.nextauth.url=https://trace-{{ secret_name }}
         --set langfuse.route.enabled=false