sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
db4a88642e
diskimage-builder/elements/dhcp-all-interfaces/install.d/50-dhcp-all-interfaces

32 lines
1.3 KiB
Plaintext
Raw Normal View History

/bin/bash all the things. Since we are using bash syntax in some of the element fragments, we should make sure we use bash for all of them, so that things don't break on systems where /bin/sh != /bin/bash. Change-Id: If2f043c57aa4e1492b7f9839213ef6123f683612
2013-11-07 04:25:34 +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:-1} -gt 0 ]; then
set -x
fi
set -eu
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 -o pipefail
Add element to run DHCP on all network interfaces. Ensures that all network interfaces are present in /etc/network/interfaces. Any interface not already defined there will be added and configured for DHCP. Change-Id: I27e0902e62804e8d719acd7288109bd0e294fd16
2013-03-05 17:34:19 +00:00
SCRIPTDIR=$(dirname $0)
Add Gentoo to the dhcp-all-interfaces element This makes use of the dhcpcd package and it's ability to run on all interfaces by default. We disable the privacy extensions and dhcp overriding the hostname (both are enabled by default). Other than that it 'just works' and was the method used to bring up interfaces on Gentoo Openstack images before we switched to building with DIB. Change-Id: I02c14927d70b22f560c6fc149fefca0f93933f56
2016-03-31 00:48:19 +00:00
# this script is not needed on Gentoo.
if [ "$DISTRO_NAME" != "gentoo" ]; then
install -D -g root -o root -m 0755 ${SCRIPTDIR}/dhcp-all-interfaces.sh /usr/local/sbin/dhcp-all-interfaces.sh
fi
Implement dhcp-all-interfaces for systemd. Includes: * Enhancements to the generate-interfaces-file.sh script so that it generates ifcfg network-scripts for distros like Fedora/RHEL. * Includes a new dhcp-all-interfaces.service systemd script which ensures network interfaces get generated before the network service starts on Fedora. * Add a new disable_interface function to generate-interfaces-file.sh which (on Fedora) will delete the ifcfg config for an interface which isn't plugged in. This is important because ifcfg-eth0 exists by default and we want to remove it if the NIC isn't connected. Previous behaviour on Ubuntu is unchanged and the generate-interfaces-file.sh just logs it as skipped. * General doc updates... I tested this on a multi-nic machine w/ Fedora where the first NIC exists but was not connected. Change-Id: Ia99e312539da43caefd72aa60398d43dac5dcc8f Closes-Bug: 1239880
2014-01-09 20:32:52 +00:00
DIB_INIT_SYSTEM=$(dib-init-system)
if [ "$DIB_INIT_SYSTEM" == "upstart" ]; then
Conditionally add dhcp-all-interfaces If the /etc/init drectory gets created on Fedora, it causes os-svc-daemon to add upstart init scripts instead of systemd. As a result none of the openstack services can start. Partial-Bug: #1239880 Change-Id: Iec317baa3eb9ff651fa66c582d2f614993cde45e
2013-10-14 22:54:37 +00:00
install -D -g root -o root -m 0755 ${SCRIPTDIR}/dhcp-all-interfaces.conf /etc/init/dhcp-all-interfaces.conf
Implement dhcp-all-interfaces for systemd. Includes: * Enhancements to the generate-interfaces-file.sh script so that it generates ifcfg network-scripts for distros like Fedora/RHEL. * Includes a new dhcp-all-interfaces.service systemd script which ensures network interfaces get generated before the network service starts on Fedora. * Add a new disable_interface function to generate-interfaces-file.sh which (on Fedora) will delete the ifcfg config for an interface which isn't plugged in. This is important because ifcfg-eth0 exists by default and we want to remove it if the NIC isn't connected. Previous behaviour on Ubuntu is unchanged and the generate-interfaces-file.sh just logs it as skipped. * General doc updates... I tested this on a multi-nic machine w/ Fedora where the first NIC exists but was not connected. Change-Id: Ia99e312539da43caefd72aa60398d43dac5dcc8f Closes-Bug: 1239880
2014-01-09 20:32:52 +00:00
elif [ "$DIB_INIT_SYSTEM" == "systemd" ]; then
DHCP: make udev rules want dhcp-interface@.service Updates the dhcp-all-interfaces element to fix a race with the recent udev rules implementation on Fedora. With the new approach we make the udev rule want (require to startup) a generic dhcp-interface@.service template which can be started individually for each interface that is discovered. The dhcp-interface@.service is setup such that it: 1) It calls dhcp-all-interfaces <iface> directly with a pre-exec script. This creates the ifcfg file right before we need it but avoids the case where network.service might get greedy and try to start it itself. 2) Only runs if the ifcfg script doesn't already exist. This is important because we only need to bootstrap the DHCP configs... Once they exist the network.service will take care of starting them on reboots, upgrades, etc. 3) On initial boot ensure that the initial DHCP interfaces come up after network.service. Since we really only want dhcp-all-interfaces to help bootstrap that haven't already been configured this seems reasonable. 4) We also try to ensure that cloud-init comes up after the DHCP interfaces. Cloud init has a decently long timeout that this wasn't a functional problem but it keeps log file spew down. Change-Id: I71b026f027182aad49c3435bb903e5e38e524685 Closes-bug: #1294803
2014-03-19 18:33:14 +00:00
install -D -g root -o root -m 0755 ${SCRIPTDIR}/dhcp-interface@.service /usr/lib/systemd/system/dhcp-interface@.service
rename udev.rules to dhcp-all-interfaces-udev Renames to udev.rules files to avoid potential install.d collisions in DIB. Change-Id: I2d70aa8b6e3e5fe957cb81c57f378d9623809c03
2014-03-21 19:12:37 +00:00
install -D -g root -o root -m 0644 ${SCRIPTDIR}/dhcp-all-interfaces-udev.rules /etc/udev/rules.d/99-dhcp-all-interfaces.rules
Add sysv support to elements/dhcp-all-interfaces This patch adds support for sysv init to the dhcp-all-interfaces element. Specifically, it adds a sysv init script and the relevant install/config steps. Tested with Debian jessie/testing. Change-Id: I4ae1d5365bafda188cb65ea1fb72d8ffe2408910
2014-04-09 11:58:36 +00:00
elif [ "$DIB_INIT_SYSTEM" == "sysv" ]; then
install -D -g root -o root -m 0755 ${SCRIPTDIR}/dhcp-all-interfaces.init /etc/init.d/dhcp-all-interfaces
update-rc.d dhcp-all-interfaces defaults
Add Gentoo to the dhcp-all-interfaces element This makes use of the dhcpcd package and it's ability to run on all interfaces by default. We disable the privacy extensions and dhcp overriding the hostname (both are enabled by default). Other than that it 'just works' and was the method used to bring up interfaces on Gentoo Openstack images before we switched to building with DIB. Change-Id: I02c14927d70b22f560c6fc149fefca0f93933f56
2016-03-31 00:48:19 +00:00
elif [ "$DISTRO_NAME" == "gentoo" ]; then
# let ipv6 use normal slaac
sed -i 's/slaac/#slaac/g' /etc/dhcpcd.conf
# don't let dhcpcd set domain name or hostname
sed -i 's/domain_name\,\ domain_search\,\ host_name/domain_search/g' /etc/dhcpcd.conf
rc-update add dhcpcd default
Conditionally add dhcp-all-interfaces If the /etc/init drectory gets created on Fedora, it causes os-svc-daemon to add upstart init scripts instead of systemd. As a result none of the openstack services can start. Partial-Bug: #1239880 Change-Id: Iec317baa3eb9ff651fa66c582d2f614993cde45e
2013-10-14 22:54:37 +00:00
fi
Reference in New Issue Copy Permalink