aboutsummaryrefslogtreecommitdiffstats
path: root/resources/tools
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
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')
-rwxr-xr-xresources/tools/disk-image-builder/centos/run-listmaker.sh4
-rw-r--r--resources/tools/disk-image-builder/centos/scripts-remote/post-install.sh16
-rw-r--r--resources/tools/virl/topologies/double-ring-nested.centos7.virl28
3 files changed, 23 insertions, 25 deletions
diff --git a/resources/tools/disk-image-builder/centos/run-listmaker.sh b/resources/tools/disk-image-builder/centos/run-listmaker.sh
index 4733ef40d8..9b195873a9 100755
--- a/resources/tools/disk-image-builder/centos/run-listmaker.sh
+++ b/resources/tools/disk-image-builder/centos/run-listmaker.sh
@@ -63,8 +63,8 @@ echo "Storing data in ${OUTPUT_DIR}/."
RPM_WANTLIST_INFRA="nfs-utils cloud-init pkgconfig yum-utils"
RPM_WANTLIST_CSIT="python-devel python-pip python-virtualenv python-setuptools python-pip openssl-devel git strongswan"
RPM_WANTLIST_VPP="dkms bridge-utils"
-RPM_WANTLIST_TREX="zlib1g-dev unzip"
-RPM_WANTLIST_MISC="gperftools glusterfs glusterfs-api libiscsi libibverbs libpcap libpcap-dev libgfrpc libgfxdr libpixman libpng14 pulseaudio-libs librados2 librbd1 librdmacm libseccomp spice-server libusb usbredir glusterfs-dev seavgabios-bin sgabios-bin ipxe-roms-qemu nss-devel seabios-bin"
+RPM_WANTLIST_TREX="zlib-devel unzip"
+RPM_WANTLIST_MISC="gperftools glusterfs glusterfs-api libiscsi libibverbs libpcap libpcap-devel pixman libpng pulseaudio-libs librados2 librbd1 librdmacm libseccomp spice-server libusb usbredir glusterfs-devel seavgabios-bin sgabios-bin ipxe-roms-qemu nss-devel seabios-bin"
RPM_WANTLIST_NESTED="qemu-img-ev-2.3.0-31.el7_2.21.1.x86_64.rpm libcacard-ev-2.3.0-31.el7_2.21.1.x86_64.rpm libcacard-devel-ev-2.3.0-31.el7_2.21.1.x86_64.rpm qemu-kvm-ev-debuginfo-2.3.0-31.el7_2.21.1.x86_64.rpm qemu-kvm-tools-ev-2.3.0-31.el7_2.21.1.x86_64.rpm qemu-kvm-common-ev-2.3.0-31.el7_2.21.1.x86_64.rpm qemu-kvm-ev-2.3.0-31.el7_2.21.1.x86_64.rpm libcacard-tools-ev-2.3.0-31.el7_2.21.1.x86_64.rpm"
RPM_WANTLIST_JAVA="java-1.8.0-openjdk-headless java-1.8.0-openjdk-devel"
diff --git a/resources/tools/disk-image-builder/centos/scripts-remote/post-install.sh b/resources/tools/disk-image-builder/centos/scripts-remote/post-install.sh
index 9ae1608203..bd45d2330c 100644
--- a/resources/tools/disk-image-builder/centos/scripts-remote/post-install.sh
+++ b/resources/tools/disk-image-builder/centos/scripts-remote/post-install.sh
@@ -15,6 +15,18 @@
TEMP_PATH="/root/temp"
+echo ==========================Remove NetworkManager============================
+systemctl disable NetworkManager
+systemctl enable network
+yum -y remove NetworkManager
+
+cat - > /etc/sysconfig/network-scripts/ifcfg-eth0 <<"_EOF"
+DEVICE=eth0
+BOOTPROTO=dhcp
+ONBOOT=yes
+_EOF
+echo =======================End Remove NetworkManager===========================
+
###
### RPMs
###
@@ -27,11 +39,9 @@ echo "********** INSTALLING RPMs **********"
# problems during the first one(s).
echo ==========================yum update==============================
yum clean all
-yum install -y @base
yum install -y deltarpm
yum update -y
-yum -y install epel-release
-yum update -y
+yum install -y @base epel-release
echo ==========================end yum update==============================
attempt=1
MAX_ATTEMPTS=3
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