Skip to content

Commit a84fe0d

Browse files
AGENT-1309: Modify OVE storage requirements
1 parent 63876c3 commit a84fe0d

File tree

3 files changed

+22
-2
lines changed

3 files changed

+22
-2
lines changed
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#!/bin/bash
2+
set -e
3+
4+
ASSISTED_SERVICE_ENV_FILE="/usr/local/share/assisted-service/assisted-service.env"
5+
DEFAULT_HW_VALIDATOR_REQUIREMENTS='[{"version":"default","master":{"cpu_cores":4,"ram_mib":16384,"disk_size_gb":100,"installation_disk_speed_threshold_ms":10,"network_latency_threshold_ms":100,"packet_loss_percentage":0},"arbiter":{"cpu_cores":2,"ram_mib":8192,"disk_size_gb":50,"installation_disk_speed_threshold_ms":10,"network_latency_threshold_ms":1000,"packet_loss_percentage":0},"worker":{"cpu_cores":2,"ram_mib":8192,"disk_size_gb":100,"installation_disk_speed_threshold_ms":10,"network_latency_threshold_ms":1000,"packet_loss_percentage":10},"sno":{"cpu_cores":8,"ram_mib":16384,"disk_size_gb":100,"installation_disk_speed_threshold_ms":10}}]'
6+
NO_REGISTRY_CLUSTER_INSTALL_HW_VALIDATOR_REQUIREMENTS='[{"version":"default","master":{"cpu_cores":4,"ram_mib":16384,"disk_size_gb":220,"installation_disk_speed_threshold_ms":10,"network_latency_threshold_ms":100,"packet_loss_percentage":0},"arbiter":{"cpu_cores":2,"ram_mib":8192,"disk_size_gb":50,"installation_disk_speed_threshold_ms":10,"network_latency_threshold_ms":1000,"packet_loss_percentage":0},"worker":{"cpu_cores":2,"ram_mib":8192,"disk_size_gb":220,"installation_disk_speed_threshold_ms":10,"network_latency_threshold_ms":1000,"packet_loss_percentage":10},"sno":{"cpu_cores":8,"ram_mib":16384,"disk_size_gb":220,"installation_disk_speed_threshold_ms":10}}]'
7+
8+
if [ -f /etc/assisted/extra-manifests/internalreleaseimage.yaml ]; then
9+
HW_VALIDATOR_REQUIREMENTS=$NO_REGISTRY_CLUSTER_INSTALL_HW_VALIDATOR_REQUIREMENTS
10+
else
11+
HW_VALIDATOR_REQUIREMENTS=$DEFAULT_HW_VALIDATOR_REQUIREMENTS
12+
fi
13+
14+
sed -i "s|^HW_VALIDATOR_REQUIREMENTS=.*|HW_VALIDATOR_REQUIREMENTS=$HW_VALIDATOR_REQUIREMENTS|" "$ASSISTED_SERVICE_ENV_FILE"

data/data/agent/files/usr/local/share/assisted-service/assisted-service.env.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ DISK_ENCRYPTION_SUPPORT=true
99
DUMMY_IGNITION=false
1010
ENABLE_SINGLE_NODE_DNSMASQ=true
1111
EPHEMERAL_INSTALLER_CLUSTER_TLS_CERTS_OVERRIDE_DIR=/opt/agent/tls
12-
HW_VALIDATOR_REQUIREMENTS=[{"version":"default","master":{"cpu_cores":4,"ram_mib":16384,"disk_size_gb":100,"installation_disk_speed_threshold_ms":10,"network_latency_threshold_ms":100,"packet_loss_percentage":0},"arbiter":{"cpu_cores":2,"ram_mib":8192,"disk_size_gb":50,"installation_disk_speed_threshold_ms":10,"network_latency_threshold_ms":1000,"packet_loss_percentage":0},"worker":{"cpu_cores":2,"ram_mib":8192,"disk_size_gb":100,"installation_disk_speed_threshold_ms":10,"network_latency_threshold_ms":1000,"packet_loss_percentage":10},"sno":{"cpu_cores":8,"ram_mib":16384,"disk_size_gb":100,"installation_disk_speed_threshold_ms":10}}]
12+
HW_VALIDATOR_REQUIREMENTS=TO_BE_REPLACED_BY_SYSTEMD
1313
INSTALL_INVOKER=agent-installer
1414
IPV6_SUPPORT=true
1515
TNA_CLUSTERS_SUPPORT=true

data/data/agent/systemd/units/assisted-service.service.template

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,21 @@ After=network-online.target assisted-service-pod.service
99
[Service]
1010
Environment=PODMAN_SYSTEMD_UNIT=%n
1111
EnvironmentFile=/usr/local/share/assisted-service/agent-images.env
12+
1213
Restart=on-failure
1314
TimeoutStartSec=500
1415
TimeoutStopSec=300
16+
1517
ExecStartPre=/bin/rm -f %t/%n.ctr-id
18+
ExecStartPre=/usr/local/bin/configure-assisted-hw-requirements.sh
19+
1620
ExecStart=/usr/bin/podman run --net host --cidfile=%t/%n.ctr-id --cgroups=no-conmon --log-driver=journald --rm --pod-id-file=%t/assisted-service-pod.pod-id --sdnotify=conmon --replace -d --name=service -v /opt/agent/tls:/opt/agent/tls:z {{ if .HaveMirrorConfig }}-v /etc/containers:/etc/containers{{ end }} {{.CaBundleMount}} --env-file=/etc/assisted/rendezvous-host.env --env-file=/usr/local/share/assisted-service/assisted-service.env --env-file=/usr/local/share/assisted-service/images.env --env-file=/etc/assisted/node0 --env-file=/usr/local/share/assisted-service/agent-images.env $SERVICE_IMAGE
21+
1722
ExecStop=/usr/bin/podman stop --ignore --cidfile=%t/%n.ctr-id
1823
ExecStopPost=/usr/bin/podman rm -f --ignore --cidfile=%t/%n.ctr-id
24+
1925
Type=notify
2026
NotifyAccess=all
2127

2228
[Install]
23-
WantedBy=multi-user.target
29+
WantedBy=multi-user.target

0 commit comments

Comments
 (0)