diff options
| author | Steven Dake <stdake@cisco.com> | 2015-06-07 12:35:05 -0700 |
|---|---|---|
| committer | Steven Dake <stdake@cisco.com> | 2015-06-16 13:18:30 -0700 |
| commit | 502aff36cdb5baac76caf0f737df9808e5bea168 (patch) | |
| tree | 3ef105eef49a5dc6d51139706a560936436e2532 | |
| parent | 23a7fa286973be3bcbfbdb17317b144ef74fa02c (diff) | |
| download | kolla-502aff36cdb5baac76caf0f737df9808e5bea168.tar.gz kolla-502aff36cdb5baac76caf0f737df9808e5bea168.zip | |
Make get-image.sh bashate compliant
Make get-image.sh bashate compliant by creating a file in /tmp
for the ifcfg temporary file and using the --upload command instead
of the --runcommand operation.
Change-Id: I4782140e227105f9aa07fb3967665eaaaeeb0cab
Partially-implements: blueprint bashate-gate
| -rwxr-xr-x | devenv/get-image.sh | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/devenv/get-image.sh b/devenv/get-image.sh index 4247be392..21166301e 100755 --- a/devenv/get-image.sh +++ b/devenv/get-image.sh @@ -7,6 +7,7 @@ IMAGE_URL=http://archive.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/Im IMAGE=Fedora-Cloud-Base-20141203-21.x86_64.qcow2 TARGET_DIR=/var/lib/libvirt/images TARGET=fedora-21-x86_64 +export LIBGUESTFS_BACKEND=direct if ! [ -f "$IMAGE" ]; then echo "Downloading $IMAGE" @@ -16,18 +17,25 @@ fi echo "Copying $IMAGE to $TARGET" cp "$IMAGE" $TARGET_DIR/$TARGET -virt-customize \ - --add $TARGET_DIR/$TARGET \ - --run-command "cat > /etc/sysconfig/network-scripts/ifcfg-eth1 <<EOF + +TMPFILE=$(mktemp /tmp/kolla-ifcfg-eth1.XXXXXXXXXX) +cat > $TMPFILE <<EOF DEVICE=eth1 BOOTPROTO=none ONBOOT=yes DEFROUTE=no -EOF" \ +EOF + + +virt-customize \ + --add $TARGET_DIR/$TARGET \ + --upload $TMPFILE:/etc/sysconfig/network-scripts/ifcfg-eth1 # SELinux relabeling requires virt-customize to have networking disabled # https://bugzilla.redhat.com/show_bug.cgi?id=1122907 virt-customize --add $TARGET_DIR/$TARGET --selinux-relabel --no-network +rm -f $TMPFILE + echo "Finished building image:" ls -l $TARGET_DIR/$TARGET |