Merge "Remove invalid NTP configuration in templates"

This commit is contained in:
Jenkins 2015-01-19 10:20:40 +00:00 committed by Gerrit Code Review
commit 6629b49665
5 changed files with 5 additions and 5 deletions

View File

@ -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:

View File

@ -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

View File

@ -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:

View File

@ -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

View File

@ -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: