Merge "Use permissive instead of disabled for SELINUX"

[releng/builder.git] / jjb / opendaylight-infra-apex-image-management.sh

diff --git a/jjb/opendaylight-infra-apex-image-management.sh b/jjb/opendaylight-infra-apex-image-management.sh
index 960c4f9a2393668a5e5a176e24497ad12d06a335..aa257782145e08d52c1f7ce1920272864d9bb63b 100644 (file)
--- a/jjb/opendaylight-infra-apex-image-management.sh
+++ b/jjb/opendaylight-infra-apex-image-management.sh
@@ -73,10 +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 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" \
     --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"
@@ -89,8 +89,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