openstack/fuel-library
Code Issues Proposed changes

Use Fuel Master for NTP if no NTP servers specified

Browse Source 
Nodes should sync time against Fuel Master if there are
no NTP servers specified. This also fixes a UI bug in Fuel
where the settings are invalid if there are no NTP servers.

Change-Id: I50422de29badf91c7739c011844609131173e34e
Partial-Bug: #1531185
This commit is contained in:
Matthew Mosesohn 2016-01-12 13:53:37 +03:00
parent 9a8dae5941
commit 5ec28d2322
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
deployment/puppet/nailgun/examples/nailgun-only.pp
View File

@ -84,9 +84,15 @@ $mco_user = $::fuel_settings['mcollective']['user']
$mco_password = $::fuel_settings['mcollective']['password']
$mco_connector = "rabbitmq"
$ntp_server_list = delete(delete_undef_values([$::fuel_settings['NTP1'],
$::fuel_settings['NTP2'], $::fuel_settings['NTP3']]), '')
$ntp_servers = join($ntp_server_list, ', ')
if empty($::fuel_settings['NTP1']) and
empty($::fuel_settings['NTP2']) and
empty($::fuel_Settings['NTP3']) {
$ntp_servers = $::fuel_settings['ADMIN_NETWORK']['ipaddress']
} else {
$ntp_server_list = delete(delete_undef_values([$::fuel_settings['NTP1'],
$::fuel_settings['NTP2'], $::fuel_settings['NTP3']]), '')
$ntp_servers = join($ntp_server_list, ', ')
}
$dns_upstream = regsubst($::fuel_settings['DNS_UPSTREAM'], ' ', ', ', 'G')