forked from rpms/cloud-init
85 lines
3.2 KiB
Diff
85 lines
3.2 KiB
Diff
|
From 836be9931cad907dc71fc9e769d185e09a33e120 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
||
|
|
Date: Tue, 31 Jan 2023 17:14:42 +0100
|
||
|
|
Subject: [PATCH] cc_set_hostname: ignore /var/lib/cloud/data/set-hostname if
|
||
|
|
it's empty (#1967)
|
||
|
|
|
||
|
|
RH-Author: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
||
|
|
RH-MergeRequest: 90: cc_set_hostname: ignore /var/lib/cloud/data/set-hostname if it's empty (#1967)
|
||
|
|
RH-Bugzilla: 2165945
|
||
|
|
RH-Acked-by: Mohamed Gamal Morsy <mmorsy@redhat.com>
|
||
|
|
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||
|
|
RH-Commit: [1/1] 2efa7c1ac15932be38bd86b9b76f8f3b18038de6
|
||
|
|
|
||
|
|
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2165945
|
||
|
|
|
||
|
|
commit 9c7502a801763520639c66125eb373123d1e4f44
|
||
|
|
Author: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
||
|
|
Date: Wed Jan 18 17:55:16 2023 +0100
|
||
|
|
|
||
|
|
cc_set_hostname: ignore /var/lib/cloud/data/set-hostname if it's empty (#1967)
|
||
|
|
|
||
|
|
If the file exists but is empty, do nothing.
|
||
|
|
Otherwise cloud-init will crash because it does not handle the empty file.
|
||
|
|
|
||
|
|
RHBZ: 2140893
|
||
|
|
|
||
|
|
Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
||
|
|
|
||
|
|
Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
||
|
|
---
|
||
|
|
cloudinit/config/cc_set_hostname.py | 2 +-
|
||
|
|
tests/unittests/config/test_cc_set_hostname.py | 17 +++++++++++++++++
|
||
|
|
2 files changed, 18 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/cloudinit/config/cc_set_hostname.py b/cloudinit/config/cc_set_hostname.py
|
||
|
|
index eb0ca328..9d78f6ad 100644
|
||
|
|
--- a/cloudinit/config/cc_set_hostname.py
|
||
|
|
+++ b/cloudinit/config/cc_set_hostname.py
|
||
|
|
@@ -86,7 +86,7 @@ def handle(name, cfg, cloud, log, _args):
|
||
|
|
# distro._read_hostname implementation so we only validate one artifact.
|
||
|
|
prev_fn = os.path.join(cloud.get_cpath("data"), "set-hostname")
|
||
|
|
prev_hostname = {}
|
||
|
|
- if os.path.exists(prev_fn):
|
||
|
|
+ if os.path.exists(prev_fn) and os.stat(prev_fn).st_size > 0:
|
||
|
|
prev_hostname = util.load_json(util.load_file(prev_fn))
|
||
|
|
hostname_changed = hostname != prev_hostname.get(
|
||
|
|
"hostname"
|
||
|
|
diff --git a/tests/unittests/config/test_cc_set_hostname.py b/tests/unittests/config/test_cc_set_hostname.py
|
||
|
|
index fd994c4e..a819039b 100644
|
||
|
|
--- a/tests/unittests/config/test_cc_set_hostname.py
|
||
|
|
+++ b/tests/unittests/config/test_cc_set_hostname.py
|
||
|
|
@@ -5,6 +5,7 @@ import os
|
||
|
|
import shutil
|
||
|
|
import tempfile
|
||
|
|
from io import BytesIO
|
||
|
|
+from pathlib import Path
|
||
|
|
from unittest import mock
|
||
|
|
|
||
|
|
from configobj import ConfigObj
|
||
|
|
@@ -204,5 +205,21 @@ class TestHostname(t_help.FilesystemMockingTestCase):
|
||
|
|
str(ctx_mgr.exception),
|
||
|
|
)
|
||
|
|
|
||
|
|
+ def test_ignore_empty_previous_artifact_file(self):
|
||
|
|
+ cfg = {
|
||
|
|
+ "hostname": "blah",
|
||
|
|
+ "fqdn": "blah.blah.blah.yahoo.com",
|
||
|
|
+ }
|
||
|
|
+ distro = self._fetch_distro("debian")
|
||
|
|
+ paths = helpers.Paths({"cloud_dir": self.tmp})
|
||
|
|
+ ds = None
|
||
|
|
+ cc = cloud.Cloud(ds, paths, {}, distro, None)
|
||
|
|
+ self.patchUtils(self.tmp)
|
||
|
|
+ prev_fn = Path(cc.get_cpath("data")) / "set-hostname"
|
||
|
|
+ prev_fn.touch()
|
||
|
|
+ cc_set_hostname.handle("cc_set_hostname", cfg, cc, LOG, [])
|
||
|
|
+ contents = util.load_file("/etc/hostname")
|
||
|
|
+ self.assertEqual("blah", contents.strip())
|
||
|
|
+
|
||
|
|
|
||
|
|
# vi: ts=4 expandtab
|
||
|
|
--
|
||
|
|
2.37.3
|
||
|
|
|