commit dc891c7f8e72070abdf254a16428a65e3ef8ed67
author mcp-jenkins <mcp-jenkins@mirantis.com> Wed Oct 24 12:08:43 2018 +0000
committer Gerrit Code Review <mail@domain.com> Wed Oct 24 12:08:43 2018 +0000
tree f7574b0d2d498b6a82e97c0f5a00e7db995a6c97
parent f6ea26dcf32e37e182c6ad61bdb33b4e887639fa
parent 262b28c56615baecbf0128c5a864db2aa517cb00

Merge "Pass rng device into qemu instances"

day01-image/template.json

diff --git a/day01-image/template.json b/day01-image/template.json
index e3224cd..25de077 100644
--- a/day01-image/template.json
+++ b/day01-image/template.json
@@ -109,7 +109,10 @@
         [
           "-smp",
           "4"
-        ]
+        ],
+        ["-device", "virtio-net,netdev=user.0"],
+        ["-object","rng-random,id=objrng0,filename=/dev/urandom"],
+        ["-device", "virtio-rng-pci,rng=objrng0,id=rng0,bus=pci.0,addr=0x10" ]
       ],
       "vm_name": "{{ user `image_name` }}-{{ isotime \"200601021504\"  }}",
       "output_directory": "images/{{ user `image_name` }}-qemu-{{ isotime \"200601021504\"  }}",

mirror-image/template.json

diff --git a/mirror-image/template.json b/mirror-image/template.json
index 4b1b24f..c79bf90 100644
--- a/mirror-image/template.json
+++ b/mirror-image/template.json
@@ -145,7 +145,10 @@
         [
           "-smp",
           "4"
-        ]
+        ],
+        ["-device", "virtio-net,netdev=user.0"],
+        ["-object","rng-random,id=objrng0,filename=/dev/urandom"],
+        ["-device", "virtio-rng-pci,rng=objrng0,id=rng0,bus=pci.0,addr=0x10" ]
       ],
       "vm_name": "{{ user `image_name` }}-{{ isotime \"200601021504\"  }}",
       "output_directory": "images/{{ user `image_name` }}-qemu-{{ isotime \"200601021504\"  }}",

ubuntu-16.04/template.json

diff --git a/ubuntu-16.04/template.json b/ubuntu-16.04/template.json
index 144cf99..ef20aaa 100644
--- a/ubuntu-16.04/template.json
+++ b/ubuntu-16.04/template.json
@@ -271,7 +271,10 @@
       "type": "qemu",
       "qemuargs": [
         [ "-m", "1024M" ],
-        [ "-cdrom", "config-drive/cloudata.iso" ]
+        [ "-cdrom", "config-drive/cloudata.iso" ],
+        ["-device", "virtio-net,netdev=user.0"],
+        ["-object","rng-random,id=objrng0,filename=/dev/urandom"],
+        ["-device", "virtio-rng-pci,rng=objrng0,id=rng0,bus=pci.0,addr=0x10" ]
       ],
       "vm_name": "{{ user `image_name` }}-{{ isotime \"200601021504\"  }}",
       "output_directory": "images/{{ user `image_name` }}-qemu-{{ isotime \"200601021504\"  }}",