sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4f4fab979e
diskimage-builder/elements/dhcp-all-interfaces/install.d/60-remove-cloud-image-interfaces

28 lines
619 B
Plaintext
Raw Normal View History

Remove cloudy interfaces in dhcp-all-interfaces Moves the code that removes default cloud interfaces into the dhcp-all-interfaces element. Having it live in stable-interface-names won't work right now because we need this for virtualized testing. Change-Id: I3166951c6fbb2faec53ffc339edd2fd0c3512300
2014-04-11 18:16:10 +00:00
#!/bin/bash
Standarise tracing for scripts There is a wide variety of tracing options through the various shell scripts. Some use "set -eux", others explicity set xtrace and others do nothing. There is a "-x" option to bin/disk-image-create but it doesn't flow down to the many scripts it calls. This adds a global integer variable set by disk-image-create DIB_DEBUG_TRACE. All scripts have a stanza added to detect this and turn on tracing. Any other tracing methods are rolled into this. So the standard header is --- if [ "${DIB_DEBUG_TRACE:-0}" -gt 0 ]; then set -x fi set -eu set -o pipefail --- Multiple -x options can be specified to dib-create-image, which increases the value of DIB_DEBUG_TRACE. If script authors feel their script should only trace at higher levels, they should modify the "-gt" value. If they feel it should trace by default, they can modify the default value also. Changes to pachset 16 : scripts which currently trace themselves by default have retained this behaviour with DIB_DEBUG_TRACE defaulting to "1". This was done by running [1] on patch set 15. See the thread beginning at [2] dib-lint is also updated to look for the variable being matched. [1] https://gist.github.com/ianw/71bbda9e6acc74ccd0fd [2] http://lists.openstack.org/pipermail/openstack-dev/2014-November/051575.html Change-Id: I6c5a962260741dcf6f89da9a33b96372a719b7b0
2014-09-04 04:56:29 +00:00
if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
set -x
fi
set -e all the things Using set -e in all of our scripts will prevent some subtle bugs from slipping in, and will allow us to enforce use of set -e with tooling. This change also adds -u and set -o pipefail in the less complex scripts where it is unlikely to cause problems. A follow-up change will enable those options in the complex scripts so that if it breaks something it can be reverted easily. Change-Id: I0ad358ccb98da7277a0ee2e9ce8fda98438675eb
2014-03-29 03:28:22 +00:00
set -eu
set -o pipefail
Remove cloudy interfaces in dhcp-all-interfaces Moves the code that removes default cloud interfaces into the dhcp-all-interfaces element. Having it live in stable-interface-names won't work right now because we need this for virtualized testing. Change-Id: I3166951c6fbb2faec53ffc339edd2fd0c3512300
2014-04-11 18:16:10 +00:00
# Cloud images may hard code the eth0 interfaces so they
Small fixes for dhcp-all-interfaces I3166951c6fbb2faec53ffc339edd2fd0c3512300 recently landed without two fixes that I suggested, namely using rm -f rather than testing for file existance, and a comment fix. Change-Id: I68e187e20802f3482d4c524a6c435fec7526178e
2014-04-17 03:45:46 +00:00
# boot with DHCP.
Remove cloudy interfaces in dhcp-all-interfaces Moves the code that removes default cloud interfaces into the dhcp-all-interfaces element. Having it live in stable-interface-names won't work right now because we need this for virtualized testing. Change-Id: I3166951c6fbb2faec53ffc339edd2fd0c3512300
2014-04-11 18:16:10 +00:00
# Fedora
Really remove all interfaces in dhcp-all-ifaces As the doc says, we want to remove all interfaces that come by default in cloud images. Cloud images also come with an eth1 though, so lets just remove all interfaces. Change-Id: I49c74a3285e6a610ac723bdf976f3727d2736749
2016-03-23 05:57:56 +00:00
rm -f /etc/sysconfig/network-scripts/ifcfg-eth*
Remove cloudy interfaces in dhcp-all-interfaces Moves the code that removes default cloud interfaces into the dhcp-all-interfaces element. Having it live in stable-interface-names won't work right now because we need this for virtualized testing. Change-Id: I3166951c6fbb2faec53ffc339edd2fd0c3512300
2014-04-11 18:16:10 +00:00
# Ubuntu
Really remove all interfaces in dhcp-all-ifaces As the doc says, we want to remove all interfaces that come by default in cloud images. Cloud images also come with an eth1 though, so lets just remove all interfaces. Change-Id: I49c74a3285e6a610ac723bdf976f3727d2736749
2016-03-23 05:57:56 +00:00
rm -f /etc/network/interfaces.d/eth*.cfg
Small fixes for dhcp-all-interfaces I3166951c6fbb2faec53ffc339edd2fd0c3512300 recently landed without two fixes that I suggested, namely using rm -f rather than testing for file existance, and a comment fix. Change-Id: I68e187e20802f3482d4c524a6c435fec7526178e
2014-04-17 03:45:46 +00:00
# Debian
Really remove all interfaces in dhcp-all-ifaces As the doc says, we want to remove all interfaces that come by default in cloud images. Cloud images also come with an eth1 though, so lets just remove all interfaces. Change-Id: I49c74a3285e6a610ac723bdf976f3727d2736749
2016-03-23 05:57:56 +00:00
rm -f /etc/network/interfaces.d/eth*
Disable all interfaces on eni systems We are autodetecting and configuring devices in dhcp-all-interfaces so having one configured in /etc/network/interfaces by default is redundant and slows boot down. Change-Id: Ic4e8a0668c793d21ed2dd96908649c9a77264f67 Closes-Bug: #1239480
2014-10-09 12:33:01 +00:00
# /etc/network/interfaces distributions
if [ -f "/etc/network/interfaces" ]; then
printf "auto lo\niface lo inet loopback\n\n" > /etc/network/interfaces
if [ -d "/etc/network/interfaces.d/" ]; then
printf "source-directory interfaces.d\n\n" >> /etc/network/interfaces
fi
fi
Reference in New Issue Copy Permalink