Move interface wait time to netconfig task

For a workaround for bug 1458625, a 32 second sleep was added to the
url_available function that is run as part of the connectivity_tests
task that is run after netconfig. This wait should be part of the
netconfig task where the delay is needed when bringing up a new
bridge in ubuntu.  This will help ensure that the interfaces are ready
after the netconfig task if the url_available task is removed or
tasks are run in a different order.

Change-Id: Ie715d6bf1622d33dd10b15c5bea74e05f1bba858
Related-Bug: 1458625
Closes-Bug: 1458954
This commit is contained in:
Alex Schultz 2015-06-16 16:17:31 -05:00
parent be2aa0818e
commit 07d10147b3
2 changed files with 9 additions and 4 deletions

View File

@ -93,10 +93,6 @@ function. Must be of type String or Hash."
end
end
#Add sleep before checking for repos
#as Ubuntu waits 32 seconds for the
#bridge to become ready
sleep 32
# if passed an array, iterate through the array an check each element
if url.instance_of? Array
url.each do |u|

View File

@ -68,3 +68,12 @@ if !defined(Service['irqbalance']) {
require => Package['irqbalance'],
}
}
# We need to wait at least 30 seconds for the bridges and other interfaces to
# come up after being created. This should allow for all interfaces to be up
# and ready for traffic before proceeding with further deploy steps. LP#1458954
exec { 'wait-for-interfaces':
path => '/usr/bin:/bin',
command => 'sleep 32',
require => Class['l23network'],
}