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

15 lines
652 B
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
set -x
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)
Rename generate-interfaces-file.sh... Rename generate-interfaces-file.sh to dhcp-all-interfaces.sh so that it is easier to find/remember in the $PATH on a deployed image. Also, on some distros the script actually generates many files so the previous name was a bit confusing. Change-Id: I7152fa7c28e8ade251311da2cd5f75972423b66c
2014-01-21 21:10:43 +00:00
install -D -g root -o root -m 0755 ${SCRIPTDIR}/dhcp-all-interfaces.sh /usr/local/sbin/dhcp-all-interfaces.sh
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
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