Merge pull request #6 from tigerblue77/2-allow-decimal-values-for-the-fan-speed

Permit decimal value for fan speed
This commit is contained in:
Tigerblue77 2022-04-11 20:13:26 +02:00 committed by GitHub
commit 67c7f905bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 9 deletions

View File

@ -25,5 +25,5 @@ RUN /usr/bin/crontab /etc/cron.d/fan-control
ENV IDRAC_HOST local ENV IDRAC_HOST local
#ENV IDRAC_USER root #ENV IDRAC_USER root
#ENV IDRAC_PW calvin #ENV IDRAC_PW calvin
ENV FANSPEED 0x05 ENV FAN_SPEED 5
CMD /startup.sh && cron && tail -f /var/log/cron.log CMD /startup.sh && cron && tail -f /var/log/cron.log

View File

@ -2,9 +2,9 @@
To use, To use,
`docker run -e IDRAC_HOST=<host ip> -e IDRAC_USER=<username> -e IDRAC_PW=<password> -e FANSPEED=<hex fan speed> alombardo4/idrac-fan-control:latest` `docker run -e IDRAC_HOST=<host ip> -e IDRAC_USER=<username> -e IDRAC_PW=<password> -e FAN_SPEED=<dec or hex fan speed> alombardo4/idrac-fan-control:latest`
`FANSPEED` should be set as a hex value, e.g. `0x05` `FAN_SPEED` can be set as a decimal or hexadecimal value (0x00 to 0x64). Default value is 5 (%).
`docker-compose.yml` examples: `docker-compose.yml` examples:
@ -19,7 +19,7 @@ services:
restart: unless-stopped restart: unless-stopped
environment: environment:
- IDRAC_HOST=local # can be omitted as it is the default value - IDRAC_HOST=local # can be omitted as it is the default value
- FANSPEED=0x05 # set to the hex value you want to set the fans to (from 0 to 100%) - FAN_SPEED=0x05 # set to the decimal or hexadecimal value you want to set the fans to (from 0 to 100%)
devices: devices:
- /dev/ipmi0:/dev/ipmi0 - /dev/ipmi0:/dev/ipmi0
``` ```
@ -37,5 +37,5 @@ services:
- IDRAC_HOST=192.168.1.100 # override to the IP of your IDRAC - IDRAC_HOST=192.168.1.100 # override to the IP of your IDRAC
- IDRAC_USER=root # set to your IPMI username - IDRAC_USER=root # set to your IPMI username
- IDRAC_PW=calvin # set to your IPMI password - IDRAC_PW=calvin # set to your IPMI password
- FANSPEED=0x05 # set to the hex value you want to set the fans to (from 0 to 100%) - FAN_SPEED=0x05 # set to the decimal or hexadecimal value you want to set the fans to (from 0 to 100%)
``` ```

View File

@ -3,7 +3,8 @@
IPMIHOST=`cat /host.txt` IPMIHOST=`cat /host.txt`
IPMIUSER=`cat /user.txt` IPMIUSER=`cat /user.txt`
IPMIPW=`cat /pw.txt` IPMIPW=`cat /pw.txt`
FANSPEED=`cat /fanspeed.txt` DECIMAL_FAN_SPEED=`cat /decimal_fan_speed.txt`
HEXADECIMAL_FAN_SPEED=`cat /hexadecimal_fan_speed.txt`
MAXTEMP=32 MAXTEMP=32
@ -24,5 +25,5 @@ then
else else
echo "Temp is OK. Using manual fan control" echo "Temp is OK. Using manual fan control"
ipmitool -I $LOGIN_STRING raw 0x30 0x30 0x01 0x00 ipmitool -I $LOGIN_STRING raw 0x30 0x30 0x01 0x00
ipmitool -I $LOGIN_STRING raw 0x30 0x30 0x02 0xff $FANSPEED ipmitool -I $LOGIN_STRING raw 0x30 0x30 0x02 0xff $HEXADECIMAL_FAN_SPEED
fi fi

View File

@ -3,7 +3,18 @@
echo $IDRAC_HOST >> /host.txt echo $IDRAC_HOST >> /host.txt
echo $IDRAC_USER >> /user.txt echo $IDRAC_USER >> /user.txt
echo $IDRAC_PW >> /pw.txt echo $IDRAC_PW >> /pw.txt
echo $FANSPEED >> /fanspeed.txt
if [[ $FAN_SPEED == 0x* ]]
then
DECIMAL_FAN_SPEED=$(printf '%d' $FAN_SPEED)
HEXADECIMAL_FAN_SPEED=$FAN_SPEED
else
DECIMAL_FAN_SPEED=$FAN_SPEED
HEXADECIMAL_FAN_SPEED=$(printf '0x%02x' $FAN_SPEED)
fi
echo $DECIMAL_FAN_SPEED >> /decimal_fan_speed.txt
echo $HEXADECIMAL_FAN_SPEED >> /hexadecimal_fan_speed.txt
echo "Host: `cat /host.txt`" echo "Host: `cat /host.txt`"
if [[ $IDRAC_HOST != "local" ]] if [[ $IDRAC_HOST != "local" ]]
@ -11,4 +22,4 @@ then
echo "User: `cat /user.txt`" echo "User: `cat /user.txt`"
echo "PW: `cat /pw.txt`" echo "PW: `cat /pw.txt`"
fi fi
echo "Fan speed `cat /fanspeed.txt`" echo "Fan speed objective: `cat /decimal_fan_speed.txt`%"