openstack
/
fuel-library
Code Issues Proposed changes

Merge "Alow user to disable ping check for default gateway"

This commit is contained in:
Jenkins 2016-01-26 13:31:54 +00:00 committed by Gerrit Code Review
parent a99428e121 967771a90e
commit 703167a6ae
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
deployment/puppet/osnailyfacter/modular/netconfig/netconfig.pp
View File

@ -86,17 +86,21 @@ exec { 'wait-for-interfaces':
command => 'sleep 32',
}
# check that network was configured successfully
# and the default gateway is online
$default_gateway = hiera('default_gateway')
$run_ping_checker = hiera('run_ping_checker', true)
ping_host { $default_gateway :
ensure => 'up',
if $run_ping_checker {
# check that network was configured successfully
# and the default gateway is online
$default_gateway = hiera('default_gateway')
ping_host { $default_gateway :
ensure => 'up',
}
L2_port<||> -> Ping_host[$default_gateway]
L2_bond<||> -> Ping_host[$default_gateway]
L3_ifconfig<||> -> Ping_host[$default_gateway]
L3_route<||> -> Ping_host[$default_gateway]
}
L2_port<||> -> Ping_host[$default_gateway]
L2_bond<||> -> Ping_host[$default_gateway]
L3_ifconfig<||> -> Ping_host[$default_gateway]
L3_route<||> -> Ping_host[$default_gateway]
Class['l23network'] ->
Exec['wait-for-interfaces']