From 78c9d6afb01bcf94a75b8da519f8d821f1c2b7f6 Mon Sep 17 00:00:00 2001 From: Pavlo Shchelokovskyy Date: Thu, 28 Jan 2016 14:12:51 +0200 Subject: [PATCH] Change Ironic metadata name in Glance images change mos_disk_info to fuel_disk_info Change-Id: I83c462424422722f210d1659eaa7cf3c1bc14aa9 Closes-Bug: #1539040 --- contrib/ironic/ironic-fa-deploy/README.rst | 4 ++-- .../ironic-fa-deploy/ironic_fa_deploy/modules/fuel_agent.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/ironic/ironic-fa-deploy/README.rst b/contrib/ironic/ironic-fa-deploy/README.rst index e6396b1..5476592 100644 --- a/contrib/ironic/ironic-fa-deploy/README.rst +++ b/contrib/ironic/ironic-fa-deploy/README.rst @@ -55,9 +55,9 @@ Replace KERNEL, INITRD, ROOTFS with Glance UUIDs of deploy images, PRIVATE_KEY with path to private key file. 8. Place disks scheme in Nailgun format to the metadata of Glance instance - image with ``mos_disk_info`` key, example:: + image with ``fuel_disk_info`` key, example:: - glance image-update --property mos_disk_info='[{"name": "sda", + glance image-update --property fuel_disk_info='[{"name": "sda", "extra": [], "free_space": 11000, "type": "disk", "id": "vda", "size": 11000, "volumes": [{"mount": "/", "type": "partition", "file_system": "ext4", "size": 10000}]}]' diff --git a/contrib/ironic/ironic-fa-deploy/ironic_fa_deploy/modules/fuel_agent.py b/contrib/ironic/ironic-fa-deploy/ironic_fa_deploy/modules/fuel_agent.py index 28fa2a6..7ca8639 100644 --- a/contrib/ironic/ironic-fa-deploy/ironic_fa_deploy/modules/fuel_agent.py +++ b/contrib/ironic/ironic-fa-deploy/ironic_fa_deploy/modules/fuel_agent.py @@ -134,7 +134,7 @@ def _get_deploy_data(context, image_source): image_props = glance.show(image_source).get('properties', {}) LOG.debug('Image %s properties are: %s', image_source, image_props) try: - disk_data = json.loads(image_props['mos_disk_info']) + disk_data = json.loads(image_props['fuel_disk_info']) except KeyError: raise exception.MissingParameterValue(_('Image %s does not contain ' 'disk layout data.') %