diff options
| author | Dmitry Tantsur <dtantsur@protonmail.com> | 2020-11-11 12:17:36 +0100 |
|---|---|---|
| committer | Dmitry Tantsur <dtantsur@protonmail.com> | 2020-11-13 11:02:57 +0000 |
| commit | 1e92c3dda0c89598a3056673b980e43d60d2f6e4 (patch) | |
| tree | 237b929eb08b31990e5d8a09e287c21e1e9c0be6 | |
| parent | 6da70f14ed2e634e9f527f52b3000c8158354a85 (diff) | |
| download | ironic-1e92c3dda0c89598a3056673b980e43d60d2f6e4.tar.gz | |
Fix incorrect network_data.json location
There is no metadata subdirectory, it goes right into openstack/latest.
Change-Id: I576c3c85515970262b5e7480913ff7daefa1b539
(cherry picked from commit 3fd513ee1c5d9846b7d44ccd7f591e42a4b88f97)
| -rw-r--r-- | ironic/drivers/modules/image_utils.py | 3 | ||||
| -rw-r--r-- | releasenotes/notes/fix-network-data2-f2600afdcc182dc4.yaml | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/ironic/drivers/modules/image_utils.py b/ironic/drivers/modules/image_utils.py index 40ae866fe..dcdeff9d1 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 000000000..501abd108 --- /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. |