openstack/fuel-library
Code Issues Proposed changes

Fix ntp.conf generation on master node

Browse Source 
When NTP2 and NTP3 are not set, ERB generates a template with 'undef'
values.  This creates a delay start up on 'master' node. For system
tests that create environment immediately after master node creation it
might create sporadic ntp failures.

- Remove 'undef' elements from ntp_servers Array

Change-Id: I00d4c9ed64f2cd0af2b5d513e9a868dfb51fea3a
Closes-Bug: bug/1504493
Signed-off-by: Sergii Golovatiuk <sgolovatiuk@mirantis.com>
This commit is contained in:
Sergii Golovatiuk 2015-10-09 15:01:13 +02:00
parent a0044771e1
commit b967cf6e09
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deployment/puppet/nailgun/examples/host-only.pp
View File

@ -10,8 +10,8 @@ else {
}
#Purge empty NTP server entries
$ntp_servers = delete([$::fuel_settings['NTP1'], $::fuel_settings['NTP2'],
$::fuel_settings['NTP3']], "")
$ntp_servers = delete(delete_undef_values([$::fuel_settings['NTP1'],
$::fuel_settings['NTP2'], $::fuel_settings['NTP3']]), "")
$admin_network = ipcalc_network_wildcard(
$::fuel_settings['ADMIN_NETWORK']['ipaddress'],

4
deployment/puppet/nailgun/examples/host-upgrade.pp
View File

@ -8,8 +8,8 @@ else {
}
#Purge empty NTP server entries
$ntp_servers = delete([$::fuel_settings['NTP1'], $::fuel_settings['NTP2'],
$::fuel_settings['NTP3']], "")
$ntp_servers = delete(delete_undef_values([$::fuel_settings['NTP1'],
$::fuel_settings['NTP2'], $::fuel_settings['NTP3']]), "")
$admin_network = ipcalc_network_wildcard(
$::fuel_settings['ADMIN_NETWORK']['ipaddress'],