aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-01-19 10:20:40 +0000
committerGerrit Code Review <review@openstack.org>2015-01-19 10:20:40 +0000
commit6629b49665ac31f71002ee603c959617e514d522 (patch)
treeba1bfcb39a6f4f57591ec7e39ef59ce577a4aa88
parent00c3a6c3b9499ca8eb0f1087863638f858540e5c (diff)
parent42a3b362479f0f9e55f8f57f7fd6d638e5bf36bf (diff)
Merge "Remove invalid NTP configuration in templates"
-rw-r--r--compute-config.yaml2
-rw-r--r--controller-config.yaml2
-rw-r--r--nova-compute-config.yaml2
-rw-r--r--overcloud-source.yaml2
-rw-r--r--undercloud-source.yaml2
5 files changed, 5 insertions, 5 deletions
diff --git a/compute-config.yaml b/compute-config.yaml
index 9698cc3b..5477e8c9 100644
--- 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 fad8879f..fa9db05a 100644
--- 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 8129cfa1..07aacd5f 100644
--- 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 a3d1e34f..f24a92bf 100644
--- 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 0b126146..ce5b7e8d 100644
--- 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: