From c2c991351430a0c5876726b7c181f8dadb121e89 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Sun, 27 Sep 2020 16:46:54 +0200 Subject: [PATCH] allow setting hostname in metadata --- bundles/hostname/files/hosts | 3 +++ bundles/systemd/items.py | 9 +++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/bundles/hostname/files/hosts b/bundles/hostname/files/hosts index 6e71b22..83520fc 100644 --- a/bundles/hostname/files/hosts +++ b/bundles/hostname/files/hosts @@ -1,4 +1,7 @@ 127.0.0.1 localhost ${node.name} ${node.hostname} +% if 'hostname' in node.metadata: +127.0.0.1 ${node.metadata['hostname']} +% endif ::1 ip6-localhost fe00::0 ip6-localnet diff --git a/bundles/systemd/items.py b/bundles/systemd/items.py index 3eeb5f2..71ad1f3 100644 --- a/bundles/systemd/items.py +++ b/bundles/systemd/items.py @@ -1,3 +1,8 @@ +if 'hostname' in node.metadata: + hostname = node.metadata['hostname'] +else: + hostname = node.hostname + actions = { 'systemd-reload': { 'command': 'systemctl daemon-reload', @@ -8,8 +13,8 @@ actions = { }, }, 'systemd-hostname': { - 'command': 'hostnamectl set-hostname {}'.format(node.hostname), - 'unless': '[ "$(hostnamectl --static)" = "{}" ]'.format(node.hostname), + 'command': 'hostnamectl set-hostname {}'.format(hostname), + 'unless': '[ "$(hostnamectl --static)" = "{}" ]'.format(hostname), # Provided by 'hostname' bundle 'needs': { 'file:/etc/hosts',