@@ -292,7 +292,7 @@ function upload_image {

     local disk_format=""

     local container_format=""

     local unpack=""

-    local img_property=""

+    local img_property="--property hw_rng_model=virtio"

     case "$image_fname" in

         *.tar.gz|*.tgz)

             # Extract ami and aki files

@@ -364,11 +364,11 @@ function upload_image {

     esac

     if is_arch "ppc64le" || is_arch "ppc64" || is_arch "ppc"; then

-        img_property="--property hw_cdrom_bus=scsi --property os_command_line=console=hvc0"

+        img_property="$img_property --property hw_cdrom_bus=scsi --property os_command_line=console=hvc0"

     fi

     if is_arch "aarch64"; then

-        img_property="--property hw_machine_type=virt --property hw_cdrom_bus=scsi --property hw_scsi_model=virtio-scsi --property os_command_line='console=ttyAMA0'"

+        img_property="$img_property --property hw_machine_type=virt --property hw_cdrom_bus=scsi --property hw_scsi_model=virtio-scsi --property os_command_line='console=ttyAMA0'"

     fi

     if [ "$container_format" = "bare" ]; then

@@ -1124,19 +1124,19 @@ function create_flavors {

     if is_service_enabled n-api; then

         if ! openstack --os-region-name="$REGION_NAME" flavor list | grep -q ds512M; then

             # Note that danms hates these flavors and apologizes for sdague

-            openstack --os-region-name="$REGION_NAME" flavor create --id c1 --ram 256 --disk 1 --vcpus 1 cirros256

-            openstack --os-region-name="$REGION_NAME" flavor create --id d1 --ram 512 --disk 5 --vcpus 1 ds512M

-            openstack --os-region-name="$REGION_NAME" flavor create --id d2 --ram 1024 --disk 10 --vcpus 1 ds1G

-            openstack --os-region-name="$REGION_NAME" flavor create --id d3 --ram 2048 --disk 10 --vcpus 2 ds2G

-            openstack --os-region-name="$REGION_NAME" flavor create --id d4 --ram 4096 --disk 20 --vcpus 4 ds4G

+            openstack --os-region-name="$REGION_NAME" flavor create --id c1 --ram 256 --disk 1 --vcpus 1 --property hw_rng:allowed=True cirros256

+            openstack --os-region-name="$REGION_NAME" flavor create --id d1 --ram 512 --disk 5 --vcpus 1 --property hw_rng:allowed=True ds512M

+            openstack --os-region-name="$REGION_NAME" flavor create --id d2 --ram 1024 --disk 10 --vcpus 1 --property hw_rng:allowed=True ds1G

+            openstack --os-region-name="$REGION_NAME" flavor create --id d3 --ram 2048 --disk 10 --vcpus 2 --property hw_rng:allowed=True ds2G

+            openstack --os-region-name="$REGION_NAME" flavor create --id d4 --ram 4096 --disk 20 --vcpus 4 --property hw_rng:allowed=True ds4G

         fi

         if ! openstack --os-region-name="$REGION_NAME" flavor list | grep -q m1.tiny; then

-            openstack --os-region-name="$REGION_NAME" flavor create --id 1 --ram 512 --disk 1 --vcpus 1 m1.tiny

-            openstack --os-region-name="$REGION_NAME" flavor create --id 2 --ram 2048 --disk 20 --vcpus 1 m1.small

-            openstack --os-region-name="$REGION_NAME" flavor create --id 3 --ram 4096 --disk 40 --vcpus 2 m1.medium

-            openstack --os-region-name="$REGION_NAME" flavor create --id 4 --ram 8192 --disk 80 --vcpus 4 m1.large

-            openstack --os-region-name="$REGION_NAME" flavor create --id 5 --ram 16384 --disk 160 --vcpus 8 m1.xlarge

+            openstack --os-region-name="$REGION_NAME" flavor create --id 1 --ram 512 --disk 1 --vcpus 1 --property hw_rng:allowed=True m1.tiny

+            openstack --os-region-name="$REGION_NAME" flavor create --id 2 --ram 2048 --disk 20 --vcpus 1 --property hw_rng:allowed=True m1.small

+            openstack --os-region-name="$REGION_NAME" flavor create --id 3 --ram 4096 --disk 40 --vcpus 2 --property hw_rng:allowed=True m1.medium

+            openstack --os-region-name="$REGION_NAME" flavor create --id 4 --ram 8192 --disk 80 --vcpus 4 --property hw_rng:allowed=True m1.large

+            openstack --os-region-name="$REGION_NAME" flavor create --id 5 --ram 16384 --disk 160 --vcpus 8 --property hw_rng:allowed=True m1.xlarge

         fi

     fi

 }

@@ -203,13 +203,13 @@ function configure_tempest {

             if [[ ! ( $available_flavors =~ 'm1.nano' ) ]]; then

                 # Determine the flavor disk size based on the image size.

                 disk=$(image_size_in_gib $image_uuid)

-                openstack flavor create --id 42 --ram 64 --disk $disk --vcpus 1 m1.nano

+                openstack flavor create --id 42 --ram 64 --disk $disk --vcpus 1 --property hw_rng:allowed=True m1.nano

             fi

             flavor_ref=42

             if [[ ! ( $available_flavors =~ 'm1.micro' ) ]]; then

                 # Determine the alt flavor disk size based on the alt image size.

                 disk=$(image_size_in_gib $image_uuid_alt)

-                openstack flavor create --id 84 --ram 128 --disk $disk --vcpus 1 m1.micro

+                openstack flavor create --id 84 --ram 128 --disk $disk --vcpus 1 --property hw_rng:allowed=True m1.micro

             fi

             flavor_ref_alt=84

         else