playbook working, tidying up task order
This commit is contained in:
@ -27,7 +27,7 @@ while true; do
|
||||
MODEL=$(echo "$SMART_DATA" | grep "Device Model" | cut -d ":" -f 2 | xargs)
|
||||
SMART=$(echo "$SMART_DATA" | grep "self-assessment test result" | cut -d ":" -f 2 | xargs)
|
||||
FLAVOR="SATA SSD"
|
||||
DRIVE_EXISTS=$(curl -s 0.0.0.0:5000/check?serial_lookup=$SERIAL | jq .serial_number_exists)
|
||||
DRIVE_EXISTS=$(curl -s "http://172.17.0.1:5000/check?serial_lookup=$SERIAL" | jq .serial_number_exists)
|
||||
# Display drive data
|
||||
echo "============ $DISK Disk Info - SSD: ============"
|
||||
#echo "DRIVE_EXISTS: $DRIVE_EXISTS"
|
||||
@ -50,15 +50,9 @@ while true; do
|
||||
H_MODEL=$(echo $MODEL | sed 's/ /%20/g')
|
||||
H_FLAVOR=$(echo $FLAVOR | sed 's/ /%20/g')
|
||||
H_CAPACITY=$(echo $CAPACITY | sed 's/ /%20/g')
|
||||
curl -s "http://0.0.0.0:5000/add_drive?serial=$SERIAL&model=$H_MODEL&flavor=$H_FLAVOR&capacity=$H_CAPACITY&TBW=$TBW&smart=$SMART"
|
||||
# curl -s "http://0.0.0.0:5000/add_drive?serial='${data[0]}'&model='${data[1]}'&flavor='${data[2]}'&capacity='${data[3]}'&TBW='${data[4]}'&smart='${data[5]}'"
|
||||
# echo "{{ service_folder }}/store_drive.sh -a '$SERIAL,$MODEL,$FLAVOR,$CAPACITY,$TBW,$SMART' -d {{ db_path }}"
|
||||
# {{ service_folder }}/store_drive.sh -a "$SERIAL,$MODEL,$FLAVOR,$CAPACITY,$TBW,$SMART" -d {{ db_path }}
|
||||
curl -s "http://172.17.0.1:5000/add_drive?serial=$SERIAL&model=$H_MODEL&flavor=$H_FLAVOR&capacity=$H_CAPACITY&TBW=$TBW&smart=$SMART"
|
||||
else
|
||||
curl -s "http://0.0.0.0:5000/update_drive?serial=$SERIAL&TBW=$TBW&smart=$SMART"
|
||||
# curl -s "http://0.0.0.0:5000/update_drive?serial='${data[0]}'&TBW='${data[1]}'&smart='${data[2]}"
|
||||
# echo "{{ service_folder }}/store_drive.sh -u '$SERIAL,$TBW,$SMART' -d {{ db_path }}"
|
||||
# {{ service_folder }}/store_drive.sh -u "$SERIAL,$TBW,$SMART" -d {{ db_path }}
|
||||
curl -s "http://172.17.0.1:5000/update_drive?serial=$SERIAL&TBW=$TBW&smart=$SMART"
|
||||
fi
|
||||
# NVMe Logic
|
||||
elif [ -n "$NVME_CHECK" ] ; then
|
||||
@ -71,7 +65,7 @@ while true; do
|
||||
CAPACITY=$(echo "$SMART_DATA" | grep "amespace 1 Size" | cut -d '[' -f 2 | sed 's/]//g')
|
||||
SMART=$(echo "$SMART_DATA" | grep "self-assessment test result" | cut -d ":" -f 2 | xargs)
|
||||
FLAVOR="NVMe"
|
||||
DRIVE_EXISTS=$(curl -s 0.0.0.0:5000/check?serial_lookup=$SERIAL | jq .serial_number_exists)
|
||||
DRIVE_EXISTS=$(curl -s "http://172.17.0.1:5000/check?serial_lookup=$SERIAL" | jq .serial_number_exists)
|
||||
# Display Disk Info
|
||||
echo "============ $DISK Disk Info - NVMe: ============"
|
||||
#echo "DRIVE_EXISTS: $DRIVE_EXISTS"
|
||||
@ -90,15 +84,9 @@ while true; do
|
||||
H_MODEL=$(echo $MODEL | sed 's/ /%20/g')
|
||||
H_FLAVOR=$(echo $FLAVOR | sed 's/ /%20/g')
|
||||
H_CAPACITY=$(echo $CAPACITY | sed 's/ /%20/g')
|
||||
curl -s "http://0.0.0.0:5000/add_drive?serial=$SERIAL&model=$H_MODEL&flavor=$H_FLAVOR&capacity=$H_CAPACITY&TBW=$TBW&smart=$SMART"
|
||||
# curl -s "http://0.0.0.0:5000/add_drive?serial='${data[0]}'&model='${data[1]}'&flavor='${data[2]}'&capacity='${data[3]}'&TBW='${data[4]}'&smart='${data[5]}'"
|
||||
# echo "{{ service_folder }}/store_drive.sh -a '$SERIAL,$MODEL,$FLAVOR,$CAPACITY,$TBW,$SMART' -d {{ db_path }}"
|
||||
# {{ service_folder }}/store_drive.sh -a "$SERIAL,$MODEL,$FLAVOR,$CAPACITY,$TBW,$SMART" -d {{ db_path }}
|
||||
curl -s "http://172.17.0.1:5000/add_drive?serial=$SERIAL&model=$H_MODEL&flavor=$H_FLAVOR&capacity=$H_CAPACITY&TBW=$TBW&smart=$SMART"
|
||||
else
|
||||
curl -s "http://0.0.0.0:5000/update_drive?serial=$SERIAL&TBW=$TBW&smart=$SMART"
|
||||
# curl -s "http://0.0.0.0:5000/update_drive?serial='${data[0]}'&TBW='${data[1]}'&smart='${data[2]}"
|
||||
# echo "{{ service_folder }}/store_drive.sh -u '$SERIAL,$TBW,$SMART' -d {{ db_path }}"
|
||||
# {{ service_folder }}/store_drive.sh -u "$SERIAL,$TBW,$SMART" -d {{ db_path }}
|
||||
curl -s "http://172.17.0.1:5000/update_drive?serial=$SERIAL&TBW=$TBW&smart=$SMART"
|
||||
fi
|
||||
fi
|
||||
else
|
||||
|
||||
@ -7,7 +7,6 @@ After=network.target
|
||||
User=root
|
||||
Group=root
|
||||
WorkingDirectory={{ service_working_folder }}
|
||||
ExecStartPre=/bin/sleep 5
|
||||
ExecStart={{ service_exe }}
|
||||
Restart=always
|
||||
|
||||
|
||||
Reference in New Issue
Block a user