x/bareon
Code Issues Proposed changes

Change Ironic metadata name in Glance images

Browse Source 
change mos_disk_info to fuel_disk_info

Change-Id: I83c462424422722f210d1659eaa7cf3c1bc14aa9
Closes-Bug: #1539040
This commit is contained in:
Pavlo Shchelokovskyy 2016-01-28 14:12:51 +02:00 committed by Alexander Gordeev
parent 582418bf0e
commit 78c9d6afb0
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/ironic/ironic-fa-deploy/README.rst
View File

@ -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 <image uuid> --property mos_disk_info='[{"name": "sda",
glance image-update <image uuid> --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}]}]'

2
contrib/ironic/ironic-fa-deploy/ironic_fa_deploy/modules/fuel_agent.py
View File

@ -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.') %