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=960c4f9a2393668a5e5a176e24497ad12d06a335;hpb=22430612b6e693fbd0100831512103382b5d3ef5;p=releng%2Fbuilder.git

diff --git a/jjb/opendaylight-infra-apex-image-management.sh b/jjb/opendaylight-infra-apex-image-management.sh
index 960c4f9a2..80054fa42 100644
--- a/jjb/opendaylight-infra-apex-image-management.sh
+++ b/jjb/opendaylight-infra-apex-image-management.sh
@@ -73,13 +73,10 @@ 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 disabled" \
-    --run-command "sudo iptables -I INPUT -p udp -m multiport --dports 4789,9876,12345 -j ACCEPT" \
-    --run-command "sudo iptables -I INPUT -p tcp --dport 12345 -j ACCEPT" \
-    --run-command "sudo iptables-save"
+    --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
@@ -89,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
@@ -117,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"