X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fvirl%2Ftopologies%2Fdouble-ring-nested.centos7.virl;h=b59d94c0ff2267739752e172a1d02a476614ab70;hp=4a88e8377bab6ffa7e0d629ec6d3b114c0131e03;hb=f8eca5691c63479e5b4c59b5d65456553d4999dd;hpb=286a8602d1846d4c84ec888af09be6b7441fc2b3

diff --git a/resources/tools/virl/topologies/double-ring-nested.centos7.virl b/resources/tools/virl/topologies/double-ring-nested.centos7.virl
index 4a88e8377b..b59d94c0ff 100644
--- a/resources/tools/virl/topologies/double-ring-nested.centos7.virl
+++ b/resources/tools/virl/topologies/double-ring-nested.centos7.virl
@@ -6,21 +6,19 @@
     <node name="tg1" type="SIMPLE" subtype="server" location="570,238" vmImage="$$VM_IMAGE$$">
         <extensions>
             <entry key="config" type="String">#cloud-config
-bootcmd:
-- ln -s -t /etc/rc.d /etc/rc.local
 hostname: tg1
 manage_etc_hosts: true
 nfs_server_scratch: $$NFS_SERVER_SCRATCH$$
 nfs_server_common: $$NFS_SERVER_COMMON$$
 runcmd:
-- systemctl enable serial-getty-digi@ttyS0.service
-- systemctl start serial-getty-digi@ttyS0.service
 - systemctl start rc-local
 - touch /tmp/before-sed
 - sed -i 's/^\s*PasswordAuthentication\s\+no/PasswordAuthentication yes/' /etc/ssh/sshd_config
 - echo "UseDNS no" &gt;&gt; /etc/ssh/sshd_config
 - service ssh restart
 - service sshd restart
+- ln -s /sbin/lspci /usr/bin/lspci
+- ln -s /sbin/pidof /usr/bin/pidof
 users:
 - default
 - gecos: User configured by VIRL Configuration Engine 0.21.4
@@ -35,9 +33,9 @@ users:
 write_files:
 - path: /usr/local/sbin/cloud-instance-name
   content: |
-    #!/usr/bin/python3.5
+    #!/usr/bin/python2.7
     import pickle
-    print(pickle.loads(open('/var/lib/cloud/instance/obj.pkl', 'rb').read(), encoding="ACSII").metadata['name'])
+    print pickle.loads(open('/var/lib/cloud/instance/obj.pkl', 'rb').read()).metadata['name']
   owner: root:root
   permissions: '0755'
 - path: /etc/rc.local
@@ -85,23 +83,22 @@ write_files:
     <node name="sut1" type="SIMPLE" subtype="vPP" location="425,26" vmImage="$$VM_IMAGE$$">
         <extensions>
             <entry key="config" type="string">#cloud-config
-bootcmd:
-- ln -s -t /etc/rc.d /etc/rc.local
 hostname: sut1
 manage_etc_hosts: true
 nfs_server_scratch: $$NFS_SERVER_SCRATCH$$
 nfs_server_common: $$NFS_SERVER_COMMON$$
 runcmd:
-- systemctl enable serial-getty-digi@ttyS0.service
-- systemctl start serial-getty-digi@ttyS0.service
 - systemctl start rc-local
-- sed -i '/^\s*PasswordAuthentication\s\+no/d' /etc/ssh/sshd_config
+- sed -i 's/^\s*PasswordAuthentication\s\+no/PasswordAuthentication yes/' /etc/ssh/sshd_config
 - echo "UseDNS no" &gt;&gt; /etc/ssh/sshd_config
 - service ssh restart
 - service sshd restart
 - sed -i 's/no-pci//' /opt/cisco/vpe/etc/qn.conf
 - sed -i 's/1024/1024 decimal-interface-names/g' /opt/cisco/vpe/etc/qn.conf
 - ln -s /dev/null /etc/sysctl.d/80-vpp.conf
+- ln -s /sbin/pidof /usr/bin/pidof
+- ln -s /usr/libexec/qemu-kvm /usr/bin/qemu-system-x86_64
+- ln -s /sbin/fuser /usr/bin/fuser
 users:
 - default
 - gecos: User configured by VIRL Configuration Engine 0.21.4
@@ -116,9 +113,9 @@ users:
 write_files:
 - path: /usr/local/sbin/cloud-instance-name
   content: |
-    #!/usr/bin/python3.5
+    #!/usr/bin/python2.7
     import pickle
-    print(pickle.loads(open('/var/lib/cloud/instance/obj.pkl', 'rb').read(), encoding="ACSII").metadata['name'])
+    print pickle.loads(open('/var/lib/cloud/instance/obj.pkl', 'rb').read()).metadata['name']
   owner: root:root
   permissions: '0755'
 - path: /etc/rc.local
@@ -189,23 +186,22 @@ write_files:
     <node name="sut2" type="SIMPLE" subtype="vPP" location="748,26" vmImage="$$VM_IMAGE$$">
         <extensions>
             <entry key="config" type="string">#cloud-config
-bootcmd:
-- ln -s -t /etc/rc.d /etc/rc.local
 hostname: sut2
 manage_etc_hosts: true
 nfs_server_scratch: $$NFS_SERVER_SCRATCH$$
 nfs_server_common: $$NFS_SERVER_COMMON$$
 runcmd:
-- systemctl enable serial-getty-digi@ttyS0.service
-- systemctl start serial-getty-digi@ttyS0.service
 - systemctl start rc-local
-- sed -i '/^\s*PasswordAuthentication\s\+no/d' /etc/ssh/sshd_config
+- sed -i 's/^\s*PasswordAuthentication\s\+no/PasswordAuthentication yes/' /etc/ssh/sshd_config
 - echo "UseDNS no" &gt;&gt; /etc/ssh/sshd_config
 - service ssh restart
 - service sshd restart
 - sed -i 's/no-pci//' /opt/cisco/vpe/etc/qn.conf
 - sed -i 's/1024/1024 decimal-interface-names/g' /opt/cisco/vpe/etc/qn.conf
 - ln -s /dev/null /etc/sysctl.d/80-vpp.conf
+- ln -s /sbin/pidof /usr/bin/pidof
+- ln -s /usr/libexec/qemu-kvm /usr/bin/qemu-system-x86_64
+- ln -s /sbin/fuser /usr/bin/fuser
 users:
 - default
 - gecos: User configured by VIRL Configuration Engine 0.21.4
@@ -220,9 +216,9 @@ users:
 write_files:
 - path: /usr/local/sbin/cloud-instance-name
   content: |
-    #!/usr/bin/python3.5
+    #!/usr/bin/python2.7
     import pickle
-    print(pickle.loads(open('/var/lib/cloud/instance/obj.pkl', 'rb').read(), encoding="ACSII").metadata['name'])
+    print pickle.loads(open('/var/lib/cloud/instance/obj.pkl', 'rb').read()).metadata['name']
   owner: root:root
   permissions: '0755'
 - path: /etc/rc.local