openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Configure NTP for overcloud compute"

This commit is contained in:
Jenkins 2014-05-20 16:30:17 +00:00 committed by Gerrit Code Review
parent 46748fdffb 97be219840
commit 28e9c8e83e
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nova-compute-config.yaml
View File

@ -50,6 +50,9 @@ Resources:
base_image_id: {get_input: nova_image}
live_update_image_id: {get_input: live_update_compute_image}
completion-signal: {get_input: deploy_signal_id}
ntp:
servers:
- {server: {get_input: ntp_server}, fudge: "stratum 0"}
NovaComputePassthrough:
Type: OS::Heat::StructuredConfig
Properties:

4
nova-compute-instance.yaml
View File

@ -58,6 +58,9 @@ Parameters:
NovaImage:
Type: String
Default: overcloud-compute
NtpServer:
Type: String
Default: ''
KeystoneHost:
Type: String
NeutronFlatNetworks:
@ -211,6 +214,7 @@ Resources:
live_update_tenant_name: {Ref: LiveUpdateTenantName}
nova_image: {Ref: NovaImage}
live_update_image_id: {Ref: LiveUpdateComputeImage}
ntp_server: {Ref: NtpServer}
NovaCompute0Passthrough:
Type: OS::Heat::StructuredDeployment
Properties: