From cdd28f8c2ed60beb8780d97b3fb38a89836d27ba Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Mon, 18 Jun 2018 09:40:50 -0600 Subject: [PATCH] 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 d49442152a3318e5afcc86bb8af6e58a74b23878) --- elements/puppet-stack-config/puppet-stack-config.yaml.template | 2 ++ 1 file changed, 2 insertions(+) diff --git a/elements/puppet-stack-config/puppet-stack-config.yaml.template b/elements/puppet-stack-config/puppet-stack-config.yaml.template index 01b4585ec..c10a9559b 100644 --- a/elements/puppet-stack-config/puppet-stack-config.yaml.template +++ b/elements/puppet-stack-config/puppet-stack-config.yaml.template @@ -8,7 +8,9 @@ controller_host: {{LOCAL_IP}} #local-ipv4 controller_host_wrapped: "{{LOCAL_IP_WRAPPED}}" controller_admin_host: {{UNDERCLOUD_ADMIN_HOST}} controller_public_host: {{UNDERCLOUD_PUBLIC_HOST}} +{{#UNDERCLOUD_NTP_SERVERS}} ntp::servers: {{UNDERCLOUD_NTP_SERVERS}} +{{/UNDERCLOUD_NTP_SERVERS}} sysctl_settings: {{SYSCTL_SETTINGS}}