X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fopendaylight-infra-apex-image-management.sh;h=80054fa426cab536f4ea0d51fcf1862a6d450c6f;hb=93a5304ef04620630cbd6de14694607048bf2aa3;hp=996ae69eacd8b5e108c74870182420712734152a;hpb=da9bea9e28e42e329f89f41eed8b19d32462780f;p=releng%2Fbuilder.git

diff --git a/jjb/opendaylight-infra-apex-image-management.sh b/jjb/opendaylight-infra-apex-image-management.sh
index 996ae69ea..80054fa42 100644
--- a/jjb/opendaylight-infra-apex-image-management.sh
+++ b/jjb/opendaylight-infra-apex-image-management.sh
@@ -21,7 +21,6 @@ pip freeze
 
 df -h
 
-cd /builder/openstack-hot || exit 1
 mkdir -p /tmp/apex_snapshots
 pushd /tmp/apex_snapshots
 
@@ -46,6 +45,7 @@ done
 # get the ssh keys and node.yaml for uploading to swift at the end
 tar -xf snapshots.tar ./id_rsa
 tar -xf snapshots.tar ./node.yaml
+tar -xf snapshots.tar ./overcloudrc
 
 ls -altr
 
@@ -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
@@ -89,7 +112,7 @@ openstack image create \
 # clean out any non ".new" OPNFV - apex images. In the case of a previously failed
 # or aborted apex management job, we can end up with multiple images with the same
 # name so being thorough here.
-openstack image list | egrep 'OPNFV - apex' | egrep -v 'new' | awk '{print "openstack image delete",$2}' | sh || true
+openstack image list | egrep 'OPNFV - apex' | egrep -v 'new' | awk '{print "openstack image delete",$2}' | sh
 
 openstack image set --name "$CONTROLLER_IMAGE_NAME" "$CONTROLLER_IMAGE_NAME.new"
 openstack image set --tag "Date Uploaded: $(date)" "$CONTROLLER_IMAGE_NAME"
@@ -108,6 +131,7 @@ openstack image set --tag "Apex Archive: $(basename $OPNFV_SNAP_URL)" "$COMPUTE_
 openstack container create OPNFV-APEX-SNAPSHOTS
 openstack object create OPNFV-APEX-SNAPSHOTS /tmp/apex_snapshots/node.yaml --name node.yaml
 openstack object create OPNFV-APEX-SNAPSHOTS /tmp/apex_snapshots/id_rsa --name id_rsa
+openstack object create OPNFV-APEX-SNAPSHOTS /tmp/apex_snapshots/overcloudrc --name overcloudrc
 openstack object list OPNFV-APEX-SNAPSHOTS
 
 openstack image list