Add version

Signed-off-by: punam biswal <[email protected]>

Author: punam20

onboarding-manager/VERSION

@@ -1 +1 @@
-1.38.6
+1.38.7

onboarding-manager/pkg/cloudinit/99_infra.cfg

@@ -105,17 +105,6 @@ write_files:
   - path: /etc/intel_edge_node/orch-ca-cert/orch-ca.crt # CA cert path used by Prometheus
     content: |
       {{- .CA_CERT | nindent 6 }}
-  - path: /opt/edge-node/node/platform_manageability_agent.sh
-    permissions: '0755'
-    content: |
-      #!/bin/bash
-      if rpc amtinfo | grep -i "AMT Pro Corporate"; then
-          echo "vPro detected, installing platform-manageability-agent.service"
-          VPRO_ENABLE=true
-      else
-          echo "vPro not detected, skipping platform-manageability-agent.service"
-          VPRO_ENABLE=false
-      fi
   - path: /etc/edge-node/node/agent_variables
     content: |
       CLUSTER_ORCH_URL={{ .ORCH_CLUSTER }}
@@ -211,6 +200,18 @@ write_files:
       Subsystem sftp /usr/lib/openssh/sftp-server
       {{- end }}
    {{- end }}
+  - path: /opt/edge-node/node/check_vpro_ism_capable.sh
+    permissions: '0755'
+    content: |
+      #!/bin/bash
+      if rpc amtinfo | grep -i "AMT Pro Corporate"; then
+          echo "vPro/ISM detected, install platform-manageability-agent.service"
+          IS_PMA_ENABLE=true
+      else
+          echo "vPro/ISM not detected, skip platform-manageability-agent.service"
+          IS_PMA_ENABLE=false
+      fi
+      echo "PMA_ENABLE=$IS_PMA_ENABLE" >> /etc/edge-node/node/agent_variables
 runcmd:
   {{- if .WITH_PRESERVE_IP }}
   - bash /opt/intel_edge_node/staticip.sh
@@ -233,15 +234,17 @@ runcmd:
     {{- end }}
     . /etc/environment
     export http_proxy https_proxy ftp_proxy socks_server no_proxy
+    bash /opt/edge-node/node/check_vpro_ism_capable.sh
     {{- if not .RUN_AS_STANDALONE }}
     {{- if .IS_MICROVISOR }}
-    bash /opt/edge-node/node/platform_manageability_agent.sh
     chown -R node-agent:bm-agents /etc/intel_edge_node/client-credentials/client_id
     chown -R node-agent:bm-agents /etc/intel_edge_node/client-credentials/client_secret
     systemctl restart caddy.service # workaround for caddy issue. Remove the line once Image is ready with caddy changes.
     SERVICES=("caddy.service" "node-agent.service" "cluster-agent.service" "hardware-discovery-agent.service" "platform-observability-collector.service" "platform-observability-health-check.service" "platform-observability-logging.service" "platform-observability-metrics.service" "platform-telemetry-agent.service" "platform-update-agent.service" "rasdaemon.service")
-    if [ "$VPRO_ENABLE" = "true" ]; then
+    if [ "$PMA_ENABLE" = "true" ]; then
       SERVICES+=("platform-manageability-agent.service")
+    else
+      sed -i '/serviceClients:/ s/platform-manageability-agent, *//; /serviceClients:/ s/, *platform-manageability-agent//; /serviceClients:/ s/platform-manageability-agent//' /etc/edge-node/node/confs/node-agent.yaml
     fi
     for SERVICE in "${SERVICES[@]}"
     do

onboarding-manager/pkg/platformbundle/ubuntu-22.04/Installer

@@ -263,18 +263,6 @@ install_node_agent(){
             echo "User '$USERNAME' added successfully."
         fi
 
-        
-        if [ -s "/opt/edge-node/node/platform_manageability_agent.sh" ]; then
-            source /opt/edge-node/node/platform_manageability_agent.sh
-        else
-            echo "/opt/edge-node/node/platform_manageability_agent.sh file does not exists"
-            exit 1
-        fi
-        if [ "$VPRO_ENABLE" = "true" ]; then
-            sed -i '/serviceClients:/ s/platform-manageability-agent, *//; /serviceClients:/ s/, *platform-manageability-agent//; /serviceClients:/ s/platform-manageability-agent//' /etc/edge-node/node/confs/node-agent.yaml
-
-        fi
-
         echo "node-agent node-agent/onboarding.serviceURL string ${HW_INVENTORY_URL}" | debconf-set-selections
         echo "node-agent node-agent/auth.accessTokenURL string ${NODE_ACCESS_URL}" | debconf-set-selections
         echo "node-agent node-agent/auth.rsTokenURL string ${NODE_RS_URL}" | debconf-set-selections
@@ -402,11 +390,8 @@ remove_lines_from_sotaSW() {
 
 install_other_agents() {
   if grep -q "install_other_agents done" "$SCRIPT_DIR"/$STATUS_FILENAME; then
-  		echo "Skipping install_other_agents"
+  	  echo "Skipping install_other_agents"
   else
-      # Get authentication token
-      RS_AT=$(get_rs_token)
-
       echo "Install bare-metal agents..."
       echo "cluster-agent cluster-agent/cluster-orchestrator-url string ${CLUSTER_ORCH_URL}" | debconf-set-selections
       echo "hardware-discovery-agent hardware-discovery-agent/onboarding.serviceURL string ${HW_INVENTORY_URL}" | debconf-set-selections
@@ -434,10 +419,14 @@ install_other_agents() {
         inbc-program="$INBC_PROGRAM_VERSION" \
         platform-update-agent="$PLATFORM_UPDATE_AGENT_VERSION" \
         platform-telemetry-agent="$PLATFORM_TELEMETRY_AGENT_VERSION"
-        if [ "$VPRO_ENABLE" = "true" ]; then
+
+        if [ "$PMA_ENABLE" = "true" ]; then
           echo "platform-manageability-agent platform-manageability-agent/manageability.serviceURL string ${PLATFORM_MANAGEABILITY_URL}" | debconf-set-selections
           echo "platform-manageability-agent platform-manageability-agent/rpsAddress string ${RPS_ADDRESS}" | debconf-set-selections
           apt-get install -y -o Dpkg::Options::="--force-confnew" platform-manageability-agent="$PLATFORM_MANAGEABILITY_AGENT_VERSION"
+        else
+          sed -i '/serviceClients:/ s/platform-manageability-agent, *//; /serviceClients:/ s/, *platform-manageability-agent//; /serviceClients:/ s/platform-manageability-agent//' /etc/edge-node/node/confs/node-agent.yaml
+          systemctl restart node-agent
         fi        
 
       # Remove docker. trtl and inbm-telemetry checks from INBM configuration file