openstack/openstack-ansible
Code Issues Proposed changes

Merge "Allow ramdisk_id, kernel_id to be null on schema"

Browse Source
This commit is contained in:
Jenkins 2015-11-30 23:38:29 +00:00 committed by Gerrit Code Review
commit 94815472ca
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
playbooks/roles/os_glance/templates/schema.json.j2
View File

@ -1,11 +1,11 @@
{ {
"kernel_id": { "kernel_id": {
"type": "string", "type": ["null", "string"],
"pattern": "^([0-9a-fA-F]){8}-([0-9a-fA-F]){4}-([0-9a-fA-F]){4}-([0-9a-fA-F]){4}-([0-9a-fA-F]){12}$", "pattern": "^([0-9a-fA-F]){8}-([0-9a-fA-F]){4}-([0-9a-fA-F]){4}-([0-9a-fA-F]){4}-([0-9a-fA-F]){12}$",
"description": "ID of image stored in Glance that should be used as the kernel when booting an AMI-style image." "description": "ID of image stored in Glance that should be used as the kernel when booting an AMI-style image."
}, },
"ramdisk_id": { "ramdisk_id": {
"type": "string", "type": ["null", "string"],
"pattern": "^([0-9a-fA-F]){8}-([0-9a-fA-F]){4}-([0-9a-fA-F]){4}-([0-9a-fA-F]){4}-([0-9a-fA-F]){12}$", "pattern": "^([0-9a-fA-F]){8}-([0-9a-fA-F]){4}-([0-9a-fA-F]){4}-([0-9a-fA-F]){4}-([0-9a-fA-F]){12}$",
"description": "ID of image stored in Glance that should be used as the ramdisk when booting an AMI-style image." "description": "ID of image stored in Glance that should be used as the ramdisk when booting an AMI-style image."
}, },