Fuel 9.1 compatibility
Change-Id: I8ccdc5a366d0acc2a41a19082e9c6c0aee1aab4f Signed-off-by: Michal Skalski <mskalski@mirantis.com>
This commit is contained in:
parent
7281b0db91
commit
0a7b260ebc
|
@ -108,7 +108,11 @@ $run_ping_checker = hiera('run_ping_checker', true)
|
||||||
if $run_ping_checker {
|
if $run_ping_checker {
|
||||||
# check that network was configured successfully
|
# check that network was configured successfully
|
||||||
# and the default gateway is online
|
# and the default gateway is online
|
||||||
$default_gateway = hiera('default_gateway')
|
if hiera('default_gateway', false) {
|
||||||
|
$default_gateway = hiera('default_gateway')
|
||||||
|
} else {
|
||||||
|
$default_gateway = get_default_gateways()
|
||||||
|
}
|
||||||
|
|
||||||
ping_host { $default_gateway :
|
ping_host { $default_gateway :
|
||||||
ensure => 'up',
|
ensure => 'up',
|
||||||
|
|
|
@ -1,11 +1,5 @@
|
||||||
class opendaylight::hiera_override {
|
class opendaylight::hiera_override {
|
||||||
$override_file = '/etc/hiera/override/opendaylight.yaml'
|
$override_file = '/etc/hiera/plugins/opendaylight.yaml'
|
||||||
$roles = hiera('roles')
|
$roles = hiera('roles')
|
||||||
odl_hiera_overrides($override_file, $roles)
|
odl_hiera_overrides($override_file, $roles)
|
||||||
|
|
||||||
file_line {'opendaylight_hiera_override':
|
|
||||||
path => '/etc/hiera.yaml',
|
|
||||||
line => ' - override/opendaylight',
|
|
||||||
after => ' - "override/module/%{calling_module}"',
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue