Merge pull request #1067 from gibizer/additiona-devices

Add more devices to the EDPM VMs

Author: openshift-merge-bot[bot]

devsetup/scripts/gen-edpm-node-common.sh

@@ -52,6 +52,18 @@ BASE_DISK_FILENAME=${BASE_DISK_FILENAME:-"$(basename ${EDPM_IMAGE_URL})"}
 DISK_FILENAME=${DISK_FILENAME:-"edpm-${EDPM_SERVER_ROLE}-${EDPM_COMPUTE_SUFFIX}.qcow2"}
 DISK_FILEPATH=${DISK_FILEPATH:-"${CRC_POOL}/${DISK_FILENAME}"}
 
+NVME1_FILENAME=${NVME1_FILENAME:-"edpm-${EDPM_SERVER_ROLE}-${EDPM_COMPUTE_SUFFIX}-nvme1.qcow2"}
+NVME1_FILEPATH=${NVME1_FILEPATH:-"${CRC_POOL}/${NVME1_FILENAME}"}
+
+qemu-img create -f qcow2 ${NVME1_FILEPATH} 1G
+chmod og+w ${NVME1_FILEPATH}
+
+NVME2_FILENAME=${NVME2_FILENAME:-"edpm-${EDPM_SERVER_ROLE}-${EDPM_COMPUTE_SUFFIX}-nvme2.qcow2"}
+NVME2_FILEPATH=${NVME2_FILEPATH:-"${CRC_POOL}/${NVME2_FILENAME}"}
+
+qemu-img create -f qcow2 ${NVME2_FILEPATH} 1G
+chmod og+w ${NVME2_FILEPATH}
+
 SSH_PUBLIC_KEY=${SSH_PUBLIC_KEY:-"${OUTPUT_DIR}/ansibleee-ssh-key-id_rsa.pub"}
 MAC_ADDRESS=${MAC_ADDRESS:-"$(echo -n 52:54:00; dd bs=1 count=3 if=/dev/random 2>/dev/null | hexdump -v -e '/1 "-%02X"' | tr '-' ':')"}
 if [ "${EDPM_SERVER_ROLE}" == "networker" ]; then
@@ -72,7 +84,7 @@ if [ ! -d "${HOME}/.ssh" ]; then
 fi
 
 cat <<EOF >${OUTPUT_DIR}/${EDPM_COMPUTE_NAME}.xml
-<domain type='kvm'>
+<domain type='kvm' xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'>
   <name>${EDPM_COMPUTE_NAME}</name>
   <memory unit='GiB'>${EDPM_COMPUTE_RAM}</memory>
   <currentMemory unit='GiB'>${EDPM_COMPUTE_RAM}</currentMemory>
@@ -90,6 +102,7 @@ cat <<EOF >${OUTPUT_DIR}/${EDPM_COMPUTE_NAME}.xml
     <acpi/>
     <apic/>
     <pae/>
+    <ioapic driver='qemu'/>
   </features>
   <cpu mode='host-passthrough' check='none' migratable='on'>
     <feature policy='disable' name='rdrand'/>
@@ -154,6 +167,14 @@ cat <<EOF >${OUTPUT_DIR}/${EDPM_COMPUTE_NAME}.xml
       <model type='virtio'/>
       <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/>
     </interface>
+    <interface type='network'>
+      <source ${EDPM_COMPUTE_NETWORK_TYPE}='${EDPM_COMPUTE_NETWORK}'/>
+      <model type='igb'/>
+    </interface>
+    <interface type='network'>
+      <source ${EDPM_COMPUTE_NETWORK_TYPE}='${EDPM_COMPUTE_NETWORK}'/>
+      <model type='igb'/>
+    </interface>
     <serial type='pty'>
       <target port='0'/>
     </serial>
@@ -175,7 +196,22 @@ cat <<EOF >${OUTPUT_DIR}/${EDPM_COMPUTE_NAME}.xml
       <backend model='random'>/dev/urandom</backend>
       <address type='pci' domain='0x0000' bus='0x05' slot='0x00' function='0x0'/>
     </rng>
+    <iommu model='intel'>
+      <driver intremap='on' iotlb='on'/>
+    </iommu>
   </devices>
+  <qemu:commandline>
+    <qemu:arg value='-drive'/>
+    <qemu:arg value='file=${NVME1_FILEPATH},format=qcow2,if=none,id=NVME1'/>
+    <qemu:arg value='-device'/>
+    <qemu:arg value='nvme,drive=NVME1,serial=nvme-1,bus=pcie.0,addr=0x8'/>
+  </qemu:commandline>
+  <qemu:commandline>
+    <qemu:arg value='-drive'/>
+    <qemu:arg value='file=${NVME2_FILEPATH},format=qcow2,if=none,id=NVME2'/>
+    <qemu:arg value='-device'/>
+    <qemu:arg value='nvme,drive=NVME2,serial=nvme-2,bus=pcie.0,addr=0x9'/>
+  </qemu:commandline>
 </domain>
 EOF