@@ -22,7 +22,9 @@ contents:
22
22
done
23
23
echo "node identified as $(</proc/sys/kernel/hostname)"
24
24
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"
26
28
exit 0
27
29
}
28
30
@@ -54,6 +56,7 @@ contents:
54
56
echo "${host_name} is longer than 63 characters, using truncated hostname"
55
57
host_name="${alt_name}"
56
58
fi
59
+ host_name="${host_name%.}"
57
60
echo "setting ${type_arg} hostname to ${host_name}"
58
61
/bin/hostnamectl "--${type_arg}" set-hostname "${host_name}"
59
62
exit 0
@@ -62,17 +65,21 @@ contents:
62
65
set_openstack_hostname() {
63
66
# Read metadata written by afterburn service
64
67
. /run/metadata/afterburn
65
-
68
+
69
+ HOSTNAME="$AFTERBURN_OPENSTACK_HOSTNAME"
70
+ CLEAN_HOSTNAME="${HOSTNAME%.}"
66
71
# 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
68
73
}
69
74
70
75
set_powervs_hostname() {
71
76
# Read metadata written by afterburn service
72
77
. /run/metadata/afterburn
73
78
79
+ HOSTNAME="$AFTERBURN_OPENSTACK_HOSTNAME"
80
+ CLEAN_HOSTNAME="${HOSTNAME%.}"
74
81
# 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
76
83
}
77
84
78
85
arg=${1}; shift;
0 commit comments