Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion onboarding-manager/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.38.7-dev
1.38.7
18 changes: 17 additions & 1 deletion onboarding-manager/pkg/cloudinit/99_infra.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,16 @@ 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 -iqE "AMT Pro Corporate|Intel Standard Manageability Corporate" > /dev/null; then
PMA_ENABLE=true
else
PMA_ENABLE=false
fi
echo "$PMA_ENABLE"
runcmd:
{{- if .WITH_PRESERVE_IP }}
- bash /opt/intel_edge_node/staticip.sh
Expand Down Expand Up @@ -227,7 +237,13 @@ runcmd:
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" "platform-manageability-agent.service")
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")
PMA_ENABLE=$(bash /opt/edge-node/node/check_vpro_ism_capable.sh)
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
systemctl start "$SERVICE" &
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,16 @@ write_files:
Ciphers [email protected],[email protected],aes256-ctr
UsePAM yes
Subsystem sftp /usr/libexec/sftp-server
- path: /opt/edge-node/node/check_vpro_ism_capable.sh
permissions: '0755'
content: |
#!/bin/bash
if rpc amtinfo | grep -iqE "AMT Pro Corporate|Intel Standard Manageability Corporate" > /dev/null; then
PMA_ENABLE=true
else
PMA_ENABLE=false
fi
echo "$PMA_ENABLE"
runcmd:
- |
grep -qF "http_proxy" /etc/environment || echo http_proxy=http-proxy.test >> /etc/environment
Expand All @@ -128,7 +138,13 @@ runcmd:
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" "platform-manageability-agent.service")
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")
PMA_ENABLE=$(bash /opt/edge-node/node/check_vpro_ism_capable.sh)
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
systemctl start "$SERVICE" &
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,16 @@ write_files:
Ciphers [email protected],[email protected],aes256-ctr
UsePAM yes
Subsystem sftp /usr/lib/openssh/sftp-server
- path: /opt/edge-node/node/check_vpro_ism_capable.sh
permissions: '0755'
content: |
#!/bin/bash
if rpc amtinfo | grep -iqE "AMT Pro Corporate|Intel Standard Manageability Corporate" > /dev/null; then
PMA_ENABLE=true
else
PMA_ENABLE=false
fi
echo "$PMA_ENABLE"
runcmd:
- |
grep -qF "http_proxy" /etc/environment || echo http_proxy=http-proxy.test >> /etc/environment
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,16 @@ write_files:
Ciphers [email protected],[email protected],aes256-ctr
UsePAM yes
Subsystem sftp /usr/libexec/sftp-server
- path: /opt/edge-node/node/check_vpro_ism_capable.sh
permissions: '0755'
content: |
#!/bin/bash
if rpc amtinfo | grep -iqE "AMT Pro Corporate|Intel Standard Manageability Corporate" > /dev/null; then
PMA_ENABLE=true
else
PMA_ENABLE=false
fi
echo "$PMA_ENABLE"
runcmd:
- |
grep -qF "http_proxy" /etc/environment || echo http_proxy=http-proxy.test >> /etc/environment
Expand All @@ -128,7 +138,13 @@ runcmd:
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" "platform-manageability-agent.service")
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")
PMA_ENABLE=$(bash /opt/edge-node/node/check_vpro_ism_capable.sh)
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
systemctl start "$SERVICE" &
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,16 @@ write_files:
Ciphers [email protected],[email protected],aes256-ctr
UsePAM yes
Subsystem sftp /usr/libexec/sftp-server
- path: /opt/edge-node/node/check_vpro_ism_capable.sh
permissions: '0755'
content: |
#!/bin/bash
if rpc amtinfo | grep -iqE "AMT Pro Corporate|Intel Standard Manageability Corporate" > /dev/null; then
PMA_ENABLE=true
else
PMA_ENABLE=false
fi
echo "$PMA_ENABLE"
runcmd:
- |
grep -qF "http_proxy" /etc/environment || echo http_proxy=http-proxy.test >> /etc/environment
Expand All @@ -120,7 +130,13 @@ runcmd:
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" "platform-manageability-agent.service")
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")
PMA_ENABLE=$(bash /opt/edge-node/node/check_vpro_ism_capable.sh)
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
systemctl start "$SERVICE" &
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,16 @@ write_files:
Ciphers [email protected],[email protected],aes256-ctr
UsePAM yes
Subsystem sftp /usr/lib/openssh/sftp-server
- path: /opt/edge-node/node/check_vpro_ism_capable.sh
permissions: '0755'
content: |
#!/bin/bash
if rpc amtinfo | grep -iqE "AMT Pro Corporate|Intel Standard Manageability Corporate" > /dev/null; then
PMA_ENABLE=true
else
PMA_ENABLE=false
fi
echo "$PMA_ENABLE"
runcmd:
- |
grep -qF "http_proxy" /etc/environment || echo http_proxy=http-proxy.test >> /etc/environment
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,16 @@ write_files:
Ciphers [email protected],[email protected],aes256-ctr
UsePAM yes
Subsystem sftp /usr/lib/openssh/sftp-server
- path: /opt/edge-node/node/check_vpro_ism_capable.sh
permissions: '0755'
content: |
#!/bin/bash
if rpc amtinfo | grep -iqE "AMT Pro Corporate|Intel Standard Manageability Corporate" > /dev/null; then
PMA_ENABLE=true
else
PMA_ENABLE=false
fi
echo "$PMA_ENABLE"
runcmd:
- |
. /etc/environment
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,16 @@ write_files:
Ciphers [email protected],[email protected],aes256-ctr
UsePAM yes
Subsystem sftp /usr/libexec/sftp-server
- path: /opt/edge-node/node/check_vpro_ism_capable.sh
permissions: '0755'
content: |
#!/bin/bash
if rpc amtinfo | grep -iqE "AMT Pro Corporate|Intel Standard Manageability Corporate" > /dev/null; then
PMA_ENABLE=true
else
PMA_ENABLE=false
fi
echo "$PMA_ENABLE"
runcmd:
- |
grep -qF "http_proxy" /etc/environment || echo http_proxy=http-proxy.test >> /etc/environment
Expand All @@ -118,7 +128,13 @@ runcmd:
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" "platform-manageability-agent.service")
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")
PMA_ENABLE=$(bash /opt/edge-node/node/check_vpro_ism_capable.sh)
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
systemctl start "$SERVICE" &
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,16 @@ write_files:
Ciphers [email protected],[email protected],aes256-ctr
UsePAM yes
Subsystem sftp /usr/lib/openssh/sftp-server
- path: /opt/edge-node/node/check_vpro_ism_capable.sh
permissions: '0755'
content: |
#!/bin/bash
if rpc amtinfo | grep -iqE "AMT Pro Corporate|Intel Standard Manageability Corporate" > /dev/null; then
PMA_ENABLE=true
else
PMA_ENABLE=false
fi
echo "$PMA_ENABLE"
runcmd:
- |
grep -qF "http_proxy" /etc/environment || echo http_proxy=http-proxy.test >> /etc/environment
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,16 @@ write_files:
Ciphers [email protected],[email protected],aes256-ctr
UsePAM yes
Subsystem sftp /usr/lib/openssh/sftp-server
- path: /opt/edge-node/node/check_vpro_ism_capable.sh
permissions: '0755'
content: |
#!/bin/bash
if rpc amtinfo | grep -iqE "AMT Pro Corporate|Intel Standard Manageability Corporate" > /dev/null; then
PMA_ENABLE=true
else
PMA_ENABLE=false
fi
echo "$PMA_ENABLE"
runcmd:
- bash /opt/intel_edge_node/staticip.sh
- |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,16 @@ write_files:
Ciphers [email protected],[email protected],aes256-ctr
UsePAM yes
Subsystem sftp /usr/libexec/sftp-server
- path: /opt/edge-node/node/check_vpro_ism_capable.sh
permissions: '0755'
content: |
#!/bin/bash
if rpc amtinfo | grep -iqE "AMT Pro Corporate|Intel Standard Manageability Corporate" > /dev/null; then
PMA_ENABLE=true
else
PMA_ENABLE=false
fi
echo "$PMA_ENABLE"
runcmd:
- bash /opt/intel_edge_node/staticip.sh
- |
Expand All @@ -147,7 +157,13 @@ runcmd:
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" "platform-manageability-agent.service")
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")
PMA_ENABLE=$(bash /opt/edge-node/node/check_vpro_ism_capable.sh)
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
systemctl start "$SERVICE" &
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,16 @@ write_files:
Ciphers [email protected],[email protected],aes256-ctr
UsePAM yes
Subsystem sftp /usr/libexec/sftp-server
- path: /opt/edge-node/node/check_vpro_ism_capable.sh
permissions: '0755'
content: |
#!/bin/bash
if rpc amtinfo | grep -iqE "AMT Pro Corporate|Intel Standard Manageability Corporate" > /dev/null; then
PMA_ENABLE=true
else
PMA_ENABLE=false
fi
echo "$PMA_ENABLE"
runcmd:
- |
grep -qF "http_proxy" /etc/environment || echo http_proxy=http-proxy.test >> /etc/environment
Expand All @@ -129,7 +139,13 @@ runcmd:
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" "platform-manageability-agent.service")
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")
PMA_ENABLE=$(bash /opt/edge-node/node/check_vpro_ism_capable.sh)
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
systemctl start "$SERVICE" &
Expand Down
Loading
Loading