diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2014-05-20 16:30:17 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2014-05-20 16:30:17 +0000 |
| commit | 28e9c8e83ef778b0ca41e5080d2abdb3e882268b (patch) | |
| tree | 6f08dee601d0487b8fcd14a28e0ca660f726069d | |
| parent | 46748fdffb57960be79971b6466cc739e052591a (diff) | |
| parent | 97be2198406de9caab6b71de148fc906c394fdb2 (diff) | |
Merge "Configure NTP for overcloud compute"
| -rw-r--r-- | nova-compute-config.yaml | 3 | ||||
| -rw-r--r-- | nova-compute-instance.yaml | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/nova-compute-config.yaml b/nova-compute-config.yaml index 4d672f66..ebc8fbd2 100644 --- a/nova-compute-config.yaml +++ b/nova-compute-config.yaml @@ -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: diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml index fe04ee4a..8cbf7759 100644 --- a/nova-compute-instance.yaml +++ b/nova-compute-instance.yaml @@ -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: |