Remove invalid NTP configuration in templates

Currently the all templates have an invalid setting for NTP
setup for the fudge setting. This should be removed from
the templates which will remove the warning seen in syslog.

ntpd[...]: inappropriate address xxx.xxx.xxx.xxx for the
    fudge command, line ignored

Partial-Bug: 1408379
Relates-To: Ib9931b84925d9ceb32f18e9adc5be64402fbf61e
Change-Id: I56a03dc0a899a8c515f2a05d678d7e80e9b7b93c

diff --git a/compute-config.yaml b/compute-config.yaml
index 9698cc3..5477e8c 100644 (file)
--- a/compute-config.yaml
+++ b/compute-config.yaml
@@ -68,7 +68,7 @@ resources:
           password: {get_input: rabbit_password}
         ntp:
           servers:
-              - {server: {get_input: ntp_server}, fudge: "stratum 0"}
+              - {server: {get_input: ntp_server}}
 
 outputs:
   config_id:

diff --git a/controller-config.yaml b/controller-config.yaml
index fad8879..fa9db05 100644 (file)
--- a/controller-config.yaml
+++ b/controller-config.yaml
@@ -128,7 +128,7 @@ resources:
           rabbit_port: {get_input: rabbit_client_port}
         ntp:
           servers:
-              - {server: {get_input: ntp_server}, fudge: "stratum 0"}
+              - {server: {get_input: ntp_server}}
         virtual_interfaces:
           instances:
             - vrrp_instance_name: VI_CONTROL

diff --git a/nova-compute-config.yaml b/nova-compute-config.yaml
index 8129cfa..07aacd5 100644 (file)
--- a/nova-compute-config.yaml
+++ b/nova-compute-config.yaml
@@ -55,7 +55,7 @@ resources:
           password: {get_input: rabbit_password}
         ntp:
           servers:
-              - {server: {get_input: ntp_server}, fudge: "stratum 0"}
+              - {server: {get_input: ntp_server}}
   NovaComputePassthrough:
     type: OS::Heat::StructuredConfig
     properties:

diff --git a/overcloud-source.yaml b/overcloud-source.yaml
index a3d1e34..f24a92b 100644 (file)
--- a/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@ -688,7 +688,7 @@ resources:
           rabbit_port: {get_param: RabbitClientPort}
         ntp:
           servers:
-              - {server: {get_param: NtpServer}, fudge: "stratum 0"}
+              - {server: {get_param: NtpServer}}
         virtual_interfaces:
           instances:
             - vrrp_instance_name: VI_CONTROL

diff --git a/undercloud-source.yaml b/undercloud-source.yaml
index 0b12614..ce5b7e8 100644 (file)
--- a/undercloud-source.yaml
+++ b/undercloud-source.yaml
@@ -346,7 +346,7 @@ resources:
             - value
         ntp:
           servers:
-            - {server: {get_param: NtpServer}, fudge: "stratum 0"}
+            - {server: {get_param: NtpServer}}
   undercloudPassthroughConfig:
     type: OS::Heat::StructuredConfig
     properties: