openstack/devstack
Code Issues Proposed changes

Merge "Fix missing --container-format options"

Browse Source
This commit is contained in:
Jenkins 2014-08-23 09:59:33 +00:00 committed by Gerrit Code Review
commit f9ae6aed61
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/baremetal
View File

@ -232,6 +232,7 @@ function upload_baremetal_deploy {
image create \ image create \
$BM_DEPLOY_KERNEL \ $BM_DEPLOY_KERNEL \
--public --disk-format=aki \ --public --disk-format=aki \
--container-format=aki \
< $TOP_DIR/files/$BM_DEPLOY_KERNEL | grep ' id ' | get_field 2) < $TOP_DIR/files/$BM_DEPLOY_KERNEL | grep ' id ' | get_field 2)
BM_DEPLOY_RAMDISK_ID=$(openstack \ BM_DEPLOY_RAMDISK_ID=$(openstack \
--os-token $token \ --os-token $token \
@ -239,6 +240,7 @@ function upload_baremetal_deploy {
image create \ image create \
$BM_DEPLOY_RAMDISK \ $BM_DEPLOY_RAMDISK \
--public --disk-format=ari \ --public --disk-format=ari \
--container-format=ari \
< $TOP_DIR/files/$BM_DEPLOY_RAMDISK | grep ' id ' | get_field 2) < $TOP_DIR/files/$BM_DEPLOY_RAMDISK | grep ' id ' | get_field 2)
} }
@ -287,6 +289,7 @@ function extract_and_upload_k_and_r_from_image {
image create \ image create \
$image_name-kernel \ $image_name-kernel \
--public --disk-format=aki \ --public --disk-format=aki \
--container-format=aki \
< $TOP_DIR/files/$OUT_KERNEL | grep ' id ' | get_field 2) < $TOP_DIR/files/$OUT_KERNEL | grep ' id ' | get_field 2)
RAMDISK_ID=$(openstack \ RAMDISK_ID=$(openstack \
--os-token $token \ --os-token $token \
@ -294,6 +297,7 @@ function extract_and_upload_k_and_r_from_image {
image create \ image create \
$image_name-initrd \ $image_name-initrd \
--public --disk-format=ari \ --public --disk-format=ari \
--container-format=ari \
< $TOP_DIR/files/$OUT_RAMDISK | grep ' id ' | get_field 2) < $TOP_DIR/files/$OUT_RAMDISK | grep ' id ' | get_field 2)
} }