Switch to cirros 0.4.0

This supports ext4 partitions with metadata_csum(as created
by ubuntu bionic by default).

Also Using it with the e1000 virt driver cirros sees the nics.

This allows us to remove 2 of the special cases we had inserted
when the CI jobs were switched to bionic.

Change-Id: I68165110dd57ed314cbc29430f84ff5092065d38
Story: #2004604
Task: #28570
Task: #28499

devstack/common_settings

@@ -4,7 +4,7 @@ if [[ -f $TOP_DIR/../../old/devstack/.localrc.auto ]]; then
     source <(cat $TOP_DIR/../../old/devstack/.localrc.auto | grep -v 'enable_plugin')
 fi
 
-CIRROS_VERSION=0.3.5
+CIRROS_VERSION=0.4.0
 
 # Whether configure the nodes to boot in Legacy BIOS or UEFI mode. Accepted
 # values are: "bios" or "uefi", defaults to "bios".

devstack/lib/ironic

@@ -889,9 +889,6 @@ function install_ironic {
     if is_ansible_deploy_enabled; then
         pip_install "$(grep '^ansible' $IRONIC_DIR/driver-requirements.txt | awk '{print $1}')"
     fi
-
-    # Disable metadata_csum from ext4 as cirros can't mount partitions with it
-    [ -f /etc/mke2fs.conf ] && sudo sed -i -e 's/,metadata_csum//g' /etc/mke2fs.conf
 }
 
 # install_ironicclient() - Collect sources and prepare
@@ -1619,8 +1616,8 @@ function create_bridge_and_vms {
 
     if [[ -n "$LIBVIRT_NIC_DRIVER" ]]; then
         vm_opts+=" -D $LIBVIRT_NIC_DRIVER"
-    elif [[ "$IRONIC_BOOT_MODE" == "uefi" || "$IRONIC_STORAGE_INTERFACE" == "cinder" ]]; then
-        # Note(derekh) Both UEFI and BVF for the moment don't work with the e1000 net driver
+    elif [[ "$IRONIC_BOOT_MODE" == "uefi" ]]; then
+        # Note(derekh) UEFI for the moment doesn't work with the e1000 net driver
         vm_opts+=" -D virtio"
     fi
 

zuul.d/ironic-jobs.yaml

@@ -215,7 +215,6 @@
     name: ironic-tempest-dsvm-bfv
     description: ironic-tempest-dsvm-bfv
     parent: ironic-base
-    nodeset: openstack-single-node-xenial
     timeout: 9600
     vars:
       tempest_test_regex: baremetal_boot_from_volume