From 3fd513ee1c5d9846b7d44ccd7f591e42a4b88f97 Mon Sep 17 00:00:00 2001 From: Dmitry Tantsur Date: Wed, 11 Nov 2020 12:17:36 +0100 Subject: [PATCH] Fix incorrect network_data.json location There is no metadata subdirectory, it goes right into openstack/latest. Change-Id: I576c3c85515970262b5e7480913ff7daefa1b539 --- ironic/drivers/modules/image_utils.py | 3 +-- releasenotes/notes/fix-network-data2-f2600afdcc182dc4.yaml | 4 ++++ 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 releasenotes/notes/fix-network-data2-f2600afdcc182dc4.yaml diff --git a/ironic/drivers/modules/image_utils.py b/ironic/drivers/modules/image_utils.py index 40ae866fe0..dcdeff9d1f 100644 --- a/ironic/drivers/modules/image_utils.py +++ b/ironic/drivers/modules/image_utils.py @@ -468,8 +468,7 @@ def prepare_deploy_iso(task, params, mode, d_info): json.dump(network_data, f, indent=2) files_info = { - metadata_fileobj.name: 'openstack/latest/meta' - 'data/network_data.json' + metadata_fileobj.name: 'openstack/latest/network_data.json' } with tempfile.NamedTemporaryFile( diff --git a/releasenotes/notes/fix-network-data2-f2600afdcc182dc4.yaml b/releasenotes/notes/fix-network-data2-f2600afdcc182dc4.yaml new file mode 100644 index 0000000000..501abd108c --- /dev/null +++ b/releasenotes/notes/fix-network-data2-f2600afdcc182dc4.yaml @@ -0,0 +1,4 @@ +--- +fixes: + - | + Fixes incorrect injected network data location when using virtual media.