Add configuration for hypervisor block storage driver #1037
Conversation
This pulls in SCSI support for block devices. Virtcontainers Shortlog: 07c2c88 test: Modify block device test to test for SCSI as well a1a569a scsi: Add SCSI support for volumes as well 3c038f1 scsi: Pass SCSI address to hyperstart agent 80bdc50 tests: Fix tests to take into account default driver for block devices 7df3f45 scsi: Add support for scsi driver for hotplugging drives 10e2349 1.0.7 release 10d462c block: Fix disabling block device use fd6f6ed pod: Factorize network creation and removal into pod functions 2fec63f pod: StartVM() does not need any parameter 0dd84be container: Remove the container from pod structure on deletion b852d93 api: Stop the VM when stopping the pod 17065de pod: Simplify pod stop bcb8643 pod: Delete containers when deleting the pod Signed-off-by: Archana Shinde <archana.m.shinde@intel.com>
|
LGTM |
|
kubernetes qa-failed 👎 |
config/configuration.toml.in
Outdated
| # Block storage driver to be used for the hypervisor in case the container | ||
| # rootfs is backed by a block device. This is either virtio-scsi or | ||
| # virtio-blk. | ||
| block_driver_driver = @DEFBLOCKSTORAGEDRIVER@ |
There was a problem hiding this comment.
This needs to be double-quoted, as currently:
$ ./cc-runtime cc-env
Near line 70 (last key parsed 'hypervisor.qemu.block_driver_driver'): expected value but found "virtio" instead
| @@ -68,6 +68,7 @@ func makeRuntimeConfig(prefixDir string) (configFile string, config oci.RuntimeC | |||
| shimPath := filepath.Join(prefixDir, "cc-shim") | |||
| proxyPath := filepath.Join(prefixDir, "cc-proxy") | |||
| disableBlock := true | |||
| blockStorageDriver := "virtio-scsi" | |||
There was a problem hiding this comment.
Seeing this change makes me wonder if we should be displaying it in the [Hypervisor] section of the cc-runtime cc-env output?
There was a problem hiding this comment.
Makes sense to show this in the cc-env output. I have included this in the PR now.
There was a problem hiding this comment.
Thanks! Could you bump formatVersion to 1.0.9 as this is a cc-env format change.
config.go
Outdated
| return defaultBlockDeviceDriver | ||
| } | ||
|
|
||
| return h.BlockDeviceDriver |
There was a problem hiding this comment.
You should validate the block device virtio-scsi or virtio-blk
Block devices can be passed using either virio-scsi or virtio-block. Fixes clearcontainers#1036 Signed-off-by: Archana Shinde <archana.m.shinde@intel.com>
amshinde
force-pushed
the
config-block-driver
branch
from
866b619 to
2082315
Compare
|
kubernetes qa-failed 👎 |
|
@chavafg I see kubernetes failing here. Is this a valid faliure? Can you post the logs? |
|
check-go-static failed |
|
@amshinde k8s failure was a network timeout, so not valid. BTW, we just switch to run k8s validation through the jenkins jobs, so no more qa-fails from clearcontainersbot |
Add the hypervisor block device driver being used in the Hypervisor section of cc-env output. Signed-off-by: Archana Shinde <archana.m.shinde@intel.com>
amshinde
force-pushed
the
config-block-driver
branch
from
2082315 to
dc15173
Compare
|
@jodh-intel Can you approve and merge this PR if this looks good to you. |
|
Thanks @amshinde. lgtm. |
No description provided.