X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fopendaylight-infra-apex-image-management.sh;h=9f9ac7a3c07dcd682de73d4fff6f391ce008cc16;hb=69d13412376b02ae459e6adbb8f57797cd63c19c;hp=2419619452e7161b352303d4dd37ca76324676cb;hpb=1436f8f5f24783f9d3fae45f4344377f1a32cf68;p=releng%2Fbuilder.git

diff --git a/jjb/opendaylight-infra-apex-image-management.sh b/jjb/opendaylight-infra-apex-image-management.sh
index 241961945..9f9ac7a3c 100644
--- a/jjb/opendaylight-infra-apex-image-management.sh
+++ b/jjb/opendaylight-infra-apex-image-management.sh
@@ -54,6 +54,31 @@ CONTROLLER_NODE=$(egrep 'type|vNode-name' node.yaml | egrep -A1 controller | tai
 COMPUTE_0_NODE=$(egrep 'type|vNode-name' node.yaml | egrep -A1 compute | tail -n1 | awk '{print $2}')
 COMPUTE_1_NODE=$(egrep 'type|vNode-name' node.yaml | egrep -A1 compute | head -n2 | tail -n1 | awk '{print $2}')
 
+# Customize images to work in ODL Vexxhost infra
+sudo yum install -y libguestfs-tools
+export LIBGUESTFS_BACKEND=direct
+virt-customize -a $CONTROLLER_NODE.qcow2 \
+  --run-command "crudini --set /var/lib/config-data/puppet-generated/neutron/etc/neutron/plugins/ml2/ml2_conf.ini ml2 physical_network_mtus datacentre:1458" \
+  --run-command "crudini --set /var/lib/config-data/puppet-generated/neutron/etc/neutron/plugins/ml2/ml2_conf.ini ml2 path_mtu 1458" \
+  --run-command "crudini --set /var/lib/config-data/puppet-generated/neutron/etc/neutron/neutron.conf '' global_physnet_mtu 1458" \
+  --run-command "crudini --set /var/lib/config-data/puppet-generated/neutron/etc/neutron/dhcp_agent.ini '' debug true" \
+
+virt-customize -a $COMPUTE_0_NODE.qcow2 \
+  --run-command "crudini --set /var/lib/config-data/puppet-generated/nova_libvirt/etc/nova/nova.conf libvirt virt_type qemu"
+
+virt-customize -a $COMPUTE_1_NODE.qcow2 \
+  --run-command "crudini --set /var/lib/config-data/puppet-generated/nova_libvirt/etc/nova/nova.conf libvirt virt_type qemu"
+
+for image in $CONTROLLER_NODE $COMPUTE_0_NODE $COMPUTE_1_NODE
+do
+  # Change interface MTU to account for default network mtu of 1458
+  virt-customize -a $image.qcow2 \
+    --run-command 'sudo echo "MTU=\"1458\"" >> /etc/sysconfig/network-scripts/ifcfg-eth0' \
+    --run-command 'sudo echo "MTU=\"1458\"" >> /etc/sysconfig/network-scripts/ifcfg-br-int' \
+    --run-command 'sudo echo "MTU=\"1458\"" >> /etc/sysconfig/network-scripts/ifcfg-ovs-system' \
+    --run-command "sudo crudini --set /etc/selinux/config '' SELINUX permissive"
+done
+
 popd
 
 openstack image list
@@ -61,8 +86,6 @@ openstack image list
 # clean out any zombie OPNFV - apex images that *may* be left over from troubled jobs
 openstack image list | egrep 'OPNFV - apex.*new ' | awk '{print "openstack image delete",$2}' | sh || true
 
-sudo yum install -y qemu-img
-
 qemu-img convert -f qcow2 -O raw /tmp/apex_snapshots/$CONTROLLER_NODE.qcow2 /tmp/apex_snapshots/$CONTROLLER_NODE.raw
 rm /tmp/apex_snapshots/$CONTROLLER_NODE.qcow2
 qemu-img convert -f qcow2 -O raw /tmp/apex_snapshots/$COMPUTE_0_NODE.qcow2 /tmp/apex_snapshots/$COMPUTE_0_NODE.raw