kelvin/warewulf
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Remove whitespace damage

Browse Source 
Signed-off-by: Jonathon Anderson <janderson@ciq.com>
This commit is contained in:
Jonathon Anderson
2024-01-21 00:13:25 -07:00
parent 5b0de8ea53
commit 5d6ef1882d
28 changed files with 79 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
container-scripts/README.md
View File

@@ -11,7 +11,7 @@ Additionally the `warewulf-container-manage.sh` script is included to manage the
## Prepare the host system
It is heavlily advised that the host has a static ipv4 address. To configure this on ALP
It is heavlily advised that the host has a static ipv4 address. To configure this on ALP
you can use `nmcli` with the following command:
```
nmcli connection modify "$(nmcli -t device | awk -F: '/ethernet/{print$4;exit}')" \
@@ -39,7 +39,7 @@ Now the cluster can be managed with the `wwctl` command.
## Remove the Container
The container itself can be remove with the '''label uninstall''' which will remove the container and its scripts from the host.
The container itself can be remove with the '''label uninstall''' which will remove the container and its scripts from the host.
```
# podman container runlabel uninstall registry.opensuse.org/suse/alp/workloads/tumbleweed_containerfiles/suse/alp/workloads/warewlf:latest
```

8
container-scripts/config-warewulf
View File

@@ -26,7 +26,7 @@ network_address() {
}
echo "-- WW4 CONFIGURAION $* --"
# Make sure that a ip address was defined for out network so that
# Make sure that a ip address was defined for out network so that
# we can configure dhcpd correctly
IP4CIDR=`ip addr | awk '/scope global/ {print $2;exit}'`
IP4=${IP4CIDR%/*}
@@ -55,9 +55,9 @@ WW4CONF=/etc/warewulf/warewulf.conf
if [ -e $WW4CONF ] ; then
test -n $IP4 && sed -i 's/^ipaddr: EMPTY/ipaddr: '$IP4'/' $WW4CONF
test -n $IP4MASK && sed -i 's/^netmask: EMPTY/netmask: '$IP4MASK'/' $WW4CONF
test -n $IP4NET && sed -i 's/^network: EMPTY/network: '$IP4NET'/' $WW4CONF
test -n $DYNSTART && sed -i 's/^ range start: EMPTY/ range start: '$DYNSTART'/' $WW4CONF
test -n $DYNEND && sed -i 's/^ range end: EMPTY/ range end: '$DYNEND'/' $WW4CONF
test -n $IP4NET && sed -i 's/^network: EMPTY/network: '$IP4NET'/' $WW4CONF
test -n $DYNSTART && sed -i 's/^ range start: EMPTY/ range start: '$DYNSTART'/' $WW4CONF
test -n $DYNEND && sed -i 's/^ range end: EMPTY/ range end: '$DYNEND'/' $WW4CONF
cat << EOF
ipaddr: $IP4
netmask: $IP4MASK

6
container-scripts/label-install
View File

@@ -16,7 +16,7 @@ BASHCOMPLETION=/usr/share/bash_completion/completions/w*
AUTHKEYDIR=/root/.ssh
echo "LABEL INSTALL"
# ensure all scripts will be present on the host
# ensure all scripts will be present on the host
copy_to_usr_local_bin() {
SCRIPT=$1
BASEDIR=`dirname $SCRIPT`
@@ -44,7 +44,7 @@ fi
sync_dir() {
DIR=$1
test -e /host/${DIR} || mkdir -pv /host/${DIR}
test -e /host/${DIR} && (rsync -au --ignore-existing ${DIR} `dirname /host/${DIR}`; echo "updating $DIR")
test -e /host/${DIR} && (rsync -au --ignore-existing ${DIR} `dirname /host/${DIR}`; echo "updating $DIR")
}
# For podman, cp a systemd unit for starting on boot
@@ -68,7 +68,7 @@ sync_dir $CHROOTDIR
sync_dir $WAREWULFCONF
# bash completion
if [ ! -e /host/etc/bash_completion.d/warewulf ] ; then
if [ ! -e /host/etc/bash_completion.d/warewulf ] ; then
mkdir -p /host/etc/bash_completion.d
cp $BASHCOMPLETION /host/etc/bash_completion.d/
fi

2
container-scripts/warewulf-container-manage.sh
View File

@@ -54,7 +54,7 @@ DEBUG:
run
podman run container '${CONTAINER_NAME}'
bash
bash
go with /bin/bash command inside '${CONTAINER_NAME}'
logs

2
container-scripts/warewulf.service
View File

@@ -14,7 +14,7 @@ RestartSec=1s
TimeoutStopSec=70
#Environment=WAREWULF_IMAGE_PATH=registry.opensuse.org/suse/alp/workloads/tumbleweed_containerfiles/suse/alp/workloads/warewulf:latest
Environment=WAREWULF_IMAGE_PATH=warewulf:latest
ExecStartPre=-/usr/bin/podman container runlabel --name warewulf install ${WAREWULF_IMAGE_PATH}
ExecStartPre=-/usr/bin/podman container runlabel --name warewulf install ${WAREWULF_IMAGE_PATH}
ExecStart=/usr/bin/podman container runlabel --name warewulf run ${WAREWULF_IMAGE_PATH}
ExecStop=/usr/bin/podman container stop warewulf
ExecStopPost=/usr/bin/podman container rm warewulf