Skip to content

Commit 43d3564

Browse files
committed
Remove trailing dot from hostname
-hostnames cannot have a trailing dot. Therefore it is being removed in each case
1 parent 06f8288 commit 43d3564

File tree

1 file changed

+11
-4
lines changed

1 file changed

+11
-4
lines changed

templates/common/_base/files/usr-local-bin-mco-hostname.yaml

+11-4
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ contents:
2222
done
2323
echo "node identified as $(</proc/sys/kernel/hostname)"
2424
echo "saving hostname to prevent NetworkManager from ever unsetting it"
25-
hostnamectl set-hostname --static --transient $(</proc/sys/kernel/hostname)
25+
HOSTNAME="$(</proc/sys/kernel/hostname)"
26+
CLEAN_HOSTNAME="${HOSTNAME%.}"
27+
hostnamectl set-hostname --static --transient "$CLEAN_HOSTNAME"
2628
exit 0
2729
}
2830
@@ -54,6 +56,7 @@ contents:
5456
echo "${host_name} is longer than 63 characters, using truncated hostname"
5557
host_name="${alt_name}"
5658
fi
59+
host_name="${host_name%.}"
5760
echo "setting ${type_arg} hostname to ${host_name}"
5861
/bin/hostnamectl "--${type_arg}" set-hostname "${host_name}"
5962
exit 0
@@ -62,17 +65,21 @@ contents:
6265
set_openstack_hostname() {
6366
# Read metadata written by afterburn service
6467
. /run/metadata/afterburn
65-
68+
69+
HOSTNAME="$AFTERBURN_OPENSTACK_HOSTNAME"
70+
CLEAN_HOSTNAME="${HOSTNAME%.}"
6671
# node-valid-hostname sets persistent hostname from /proc/sys/kernel/hostname
67-
echo "$AFTERBURN_OPENSTACK_HOSTNAME" > /proc/sys/kernel/hostname
72+
echo "$CLEAN_HOSTNAME" > /proc/sys/kernel/hostname
6873
}
6974
7075
set_powervs_hostname() {
7176
# Read metadata written by afterburn service
7277
. /run/metadata/afterburn
7378
79+
HOSTNAME="$AFTERBURN_OPENSTACK_HOSTNAME"
80+
CLEAN_HOSTNAME="${HOSTNAME%.}"
7481
# node-valid-hostname sets persistent hostname from /proc/sys/kernel/hostname
75-
echo "$AFTERBURN_POWERVS_LOCAL_HOSTNAME" > /proc/sys/kernel/hostname
82+
echo "$CLEAN_HOSTNAME" > /proc/sys/kernel/hostname
7683
}
7784
7885
arg=${1}; shift;

0 commit comments

Comments
 (0)