Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
CSIT-111: Add Packer based framework to auto-generate disk images
[csit.git]
/
resources
/
tools
/
virl
/
topologies
/
double-ring-nested.virl
diff --git
a/resources/tools/virl/topologies/double-ring-nested.virl
b/resources/tools/virl/topologies/double-ring-nested.virl
index
9018cb5
..
4dd5885
100644
(file)
--- a/
resources/tools/virl/topologies/double-ring-nested.virl
+++ b/
resources/tools/virl/topologies/double-ring-nested.virl
@@
-3,7
+3,7
@@
<extensions>
<entry key="management_network" type="String">flat</entry>
</extensions>
<extensions>
<entry key="management_network" type="String">flat</entry>
</extensions>
- <node name="tg1" type="SIMPLE" subtype="server" location="570,238" vmImage="
server-java-nested
">
+ <node name="tg1" type="SIMPLE" subtype="server" location="570,238" vmImage="
$$VM_IMAGE$$
">
<extensions>
<entry key="config" type="String">#cloud-config
bootcmd:
<extensions>
<entry key="config" type="String">#cloud-config
bootcmd:
@@
-91,6
+91,7
@@
write_files:
mount -t nfs "${nfs_server_common}" /mnt/common
mkdir /scratch/$(hostname)
mount -t nfs "${nfs_server_common}" /mnt/common
mkdir /scratch/$(hostname)
+ cp /VERSION /scratch/$(hostname)/
exit 0
</entry>
exit 0
</entry>
@@
-103,7
+104,7
@@
write_files:
<interface id="4" name="eth5"/>
<interface id="5" name="eth6"/>
</node>
<interface id="4" name="eth5"/>
<interface id="5" name="eth6"/>
</node>
- <node name="sut1" type="SIMPLE" subtype="vPP" location="425,26" vmImage="
server-java-nested
">
+ <node name="sut1" type="SIMPLE" subtype="vPP" location="425,26" vmImage="
$$VM_IMAGE$$
">
<extensions>
<entry key="config" type="string">#cloud-config
bootcmd:
<extensions>
<entry key="config" type="string">#cloud-config
bootcmd:
@@
-191,7
+192,16
@@
write_files:
mount -t nfs "${nfs_server_common}" /mnt/common
mount -t nfs "${nfs_server_common}" /mnt/common
+ # Overwrite nested VM image with latest as per NFS
+ if [ -f /mnt/common/nested-vm-current.img ]
+ then
+ rm -f /var/lib/vm/vhost-nested.img
+ cp /mnt/common/nested-vm-current.img /var/lib/vm/vhost-nested.img
+ fi
+
mkdir /scratch/$(hostname)
mkdir /scratch/$(hostname)
+ cp /VERSION /scratch/$(hostname)/
+ cat /var/lib/vm/vhost-nested.img | strings | grep NESTED_VERSION= > /scratch/$(hostname)/NESTED_VERSION
exit 0
</entry>
exit 0
</entry>
@@
-201,7
+211,7
@@
write_files:
<interface id="2" name="GigabitEthernet0/6/0"/>
<interface id="3" name="GigabitEthernet0/7/0"/>
</node>
<interface id="2" name="GigabitEthernet0/6/0"/>
<interface id="3" name="GigabitEthernet0/7/0"/>
</node>
- <node name="sut2" type="SIMPLE" subtype="vPP" location="748,26" vmImage="
server-java-nested
">
+ <node name="sut2" type="SIMPLE" subtype="vPP" location="748,26" vmImage="
$$VM_IMAGE$$
">
<extensions>
<entry key="config" type="string">#cloud-config
bootcmd:
<extensions>
<entry key="config" type="string">#cloud-config
bootcmd:
@@
-289,7
+299,16
@@
write_files:
mount -t nfs "${nfs_server_common}" /mnt/common
mount -t nfs "${nfs_server_common}" /mnt/common
+ # Overwrite nested VM image with latest as per NFS
+ if [ -f /mnt/common/nested-vm-current.img ]
+ then
+ rm -f /var/lib/vm/vhost-nested.img
+ cp /mnt/common/nested-vm-current.img /var/lib/vm/vhost-nested.img
+ fi
+
mkdir /scratch/$(hostname)
mkdir /scratch/$(hostname)
+ cp /VERSION /scratch/$(hostname)/
+ cat /var/lib/vm/vhost-nested.img | strings | grep NESTED_VERSION= > /scratch/$(hostname)/NESTED_VERSION
exit 0
</entry>
exit 0
</entry>