Fall back to puppet-ntp defaults
If the ntp server is not configured in the undercloud.conf, we should
fall back to the defaults provided by puppet-ntp otherwise we end up
with an invalid ntp configuration.
Change-Id: I0000e1cf736b513dbc58c0d39f7e1c0137b660dd
Closes-BUg: #1777140
(cherry picked from commit d49442152a
)
This commit is contained in:
parent
73ff0df34b
commit
cdd28f8c2e
@ -8,7 +8,9 @@ controller_host: {{LOCAL_IP}} #local-ipv4
|
|||||||
controller_host_wrapped: "{{LOCAL_IP_WRAPPED}}"
|
controller_host_wrapped: "{{LOCAL_IP_WRAPPED}}"
|
||||||
controller_admin_host: {{UNDERCLOUD_ADMIN_HOST}}
|
controller_admin_host: {{UNDERCLOUD_ADMIN_HOST}}
|
||||||
controller_public_host: {{UNDERCLOUD_PUBLIC_HOST}}
|
controller_public_host: {{UNDERCLOUD_PUBLIC_HOST}}
|
||||||
|
{{#UNDERCLOUD_NTP_SERVERS}}
|
||||||
ntp::servers: {{UNDERCLOUD_NTP_SERVERS}}
|
ntp::servers: {{UNDERCLOUD_NTP_SERVERS}}
|
||||||
|
{{/UNDERCLOUD_NTP_SERVERS}}
|
||||||
|
|
||||||
sysctl_settings: {{SYSCTL_SETTINGS}}
|
sysctl_settings: {{SYSCTL_SETTINGS}}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user