diff --git a/deployment/puppet/osnailyfacter/lib/puppet/parser/functions/url_available.rb b/deployment/puppet/osnailyfacter/lib/puppet/parser/functions/url_available.rb index 80e092d118..4185dd7260 100644 --- a/deployment/puppet/osnailyfacter/lib/puppet/parser/functions/url_available.rb +++ b/deployment/puppet/osnailyfacter/lib/puppet/parser/functions/url_available.rb @@ -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| diff --git a/deployment/puppet/osnailyfacter/modular/netconfig/netconfig.pp b/deployment/puppet/osnailyfacter/modular/netconfig/netconfig.pp index 3db7a8129a..298a4d17c2 100644 --- a/deployment/puppet/osnailyfacter/modular/netconfig/netconfig.pp +++ b/deployment/puppet/osnailyfacter/modular/netconfig/netconfig.pp @@ -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'], +}