Cooresponding fix to https://review.openstack.org/114619 for lib/baremetal.
Closes-bug: 1357602
Change-Id: I1f4482f218b51ce7d7617cbd5771790c8dcb631a
| ... | ... |
@@ -235,6 +235,7 @@ function upload_baremetal_deploy {
|
| 235 | 235 |
image create \ |
| 236 | 236 |
$BM_DEPLOY_KERNEL \ |
| 237 | 237 |
--public --disk-format=aki \ |
| 238 |
+ --container-format=aki \ |
|
| 238 | 239 |
< $TOP_DIR/files/$BM_DEPLOY_KERNEL | grep ' id ' | get_field 2) |
| 239 | 240 |
BM_DEPLOY_RAMDISK_ID=$(openstack \ |
| 240 | 241 |
--os-token $token \ |
| ... | ... |
@@ -242,6 +243,7 @@ function upload_baremetal_deploy {
|
| 242 | 242 |
image create \ |
| 243 | 243 |
$BM_DEPLOY_RAMDISK \ |
| 244 | 244 |
--public --disk-format=ari \ |
| 245 |
+ --container-format=ari \ |
|
| 245 | 246 |
< $TOP_DIR/files/$BM_DEPLOY_RAMDISK | grep ' id ' | get_field 2) |
| 246 | 247 |
} |
| 247 | 248 |
|
| ... | ... |
@@ -290,6 +292,7 @@ function extract_and_upload_k_and_r_from_image {
|
| 290 | 290 |
image create \ |
| 291 | 291 |
$image_name-kernel \ |
| 292 | 292 |
--public --disk-format=aki \ |
| 293 |
+ --container-format=aki \ |
|
| 293 | 294 |
< $TOP_DIR/files/$OUT_KERNEL | grep ' id ' | get_field 2) |
| 294 | 295 |
RAMDISK_ID=$(openstack \ |
| 295 | 296 |
--os-token $token \ |
| ... | ... |
@@ -297,6 +300,7 @@ function extract_and_upload_k_and_r_from_image {
|
| 297 | 297 |
image create \ |
| 298 | 298 |
$image_name-initrd \ |
| 299 | 299 |
--public --disk-format=ari \ |
| 300 |
+ --container-format=ari \ |
|
| 300 | 301 |
< $TOP_DIR/files/$OUT_RAMDISK | grep ' id ' | get_field 2) |
| 301 | 302 |
} |
| 302 | 303 |
|