From 2747613ca2fc51118526f4ad6e28ed7b49e50632 Mon Sep 17 00:00:00 2001 From: Ben Nemec Date: Thu, 22 Sep 2016 14:25:31 -0500 Subject: [PATCH] Shorten DHCP timeout in dhcp-all-interfaces We are currently wasting about 10 minutes per deploy waiting for DHCP on interfaces that will never get it. By default, the timeout seems to be 5 minutes (the 10 minutes is because we boot both the IPA ramdisk and the deployed image, and each waits for 5 minutes), which is excessively long to get a DHCP response. This change shortens the time to 30 seconds. If an interface hasn't gotten a response in 30 seconds, chances are it's not going to. A 30 second wait should reduce our wasted time to 1 minute, which is more reasonable. This is being done in the systemd unit file because the -timeout option to dhclient doesn't seem to override what is configured in dhclient.conf, and doing it in the systemd file means that this change will be limited to only the interfaces configured by dhcp-all-interfaces. Change-Id: Ia8610e3def39c937eb0c861fdc9bc571ec39f9f4 Closes-Bug: 1626673 --- elements/dhcp-all-interfaces/install.d/dhcp-interface@.service | 1 + 1 file changed, 1 insertion(+) diff --git a/elements/dhcp-all-interfaces/install.d/dhcp-interface@.service b/elements/dhcp-all-interfaces/install.d/dhcp-interface@.service index 14c47305..11276502 100644 --- a/elements/dhcp-all-interfaces/install.d/dhcp-interface@.service +++ b/elements/dhcp-all-interfaces/install.d/dhcp-interface@.service @@ -11,6 +11,7 @@ User=root ExecStartPre=/usr/local/sbin/dhcp-all-interfaces.sh %I ExecStart=/sbin/ifup %I RemainAfterExit=true +TimeoutStartSec=30s [Install] WantedBy=multi-user.target