aboutsummaryrefslogtreecommitdiffstats
path: root/resources/tools/virl
diff options
context:
space:
mode:
authorMatej Klotton <mklotton@cisco.com>2017-02-14 07:45:01 +0100
committerMatej Klotton <mklotton@cisco.com>2017-02-15 13:22:25 +0100
commite5a63c071996f351d6037ba8a08ff8eecf32ca39 (patch)
tree8d7d3e7115c56d05f7229ef5dfdcf9203cb79b73 /resources/tools/virl
parent005e7e00d0e9b9d4c0796c998b88d639ee316033 (diff)
Fix Centos Virl deployment and image build want list
Change-Id: I65d54fff4f936444bed3382ee21a260cf718bafd Signed-off-by: Matej Klotton <mklotton@cisco.com>
Diffstat (limited to 'resources/tools/virl')
-rw-r--r--resources/tools/virl/topologies/double-ring-nested.centos7.virl28
1 files changed, 8 insertions, 20 deletions
diff --git a/resources/tools/virl/topologies/double-ring-nested.centos7.virl b/resources/tools/virl/topologies/double-ring-nested.centos7.virl
index 4a88e8377b..e4265979ed 100644
--- a/resources/tools/virl/topologies/double-ring-nested.centos7.virl
+++ b/resources/tools/virl/topologies/double-ring-nested.centos7.virl
@@ -6,15 +6,11 @@
<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
@@ -35,9 +31,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,17 +81,13 @@ 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
@@ -116,9 +108,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,17 +181,13 @@ 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
@@ -220,9 +208,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