openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Remove NTP"

Browse Source
This commit is contained in:
Zuul 2019-05-06 23:49:41 +00:00 committed by Gerrit Code Review
commit 1c4d4e3862
6 changed files with 10 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

115
deployment/time/ntp-baremetal-puppet.yaml
View File

@ -1,115 +0,0 @@
heat_template_version: rocky
description: >
NTP service deployment using puppet, this YAML file
creates the interface between the HOT template
and the puppet manifest that actually installs
and configure NTP.
parameters:
ServiceData:
default: {}
description: Dictionary packing service data
type: json
ServiceNetMap:
default: {}
description: Mapping of service_name -> network name. Typically set
via parameter_defaults in the resource registry. This
mapping overrides those in ServiceNetMapDefaults.
type: json
DefaultPasswords:
default: {}
type: json
RoleName:
default: ''
description: Role name on which the service is applied
type: string
RoleParameters:
default: {}
description: Parameters specific to the role
type: json
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
via parameter_defaults in the resource registry.
type: json
NtpServer:
default: ['0.pool.ntp.org', '1.pool.ntp.org', '2.pool.ntp.org', '3.pool.ntp.org']
description: NTP servers list. Defaulted to a set of pool.ntp.org servers
in order to have a sane default for Pacemaker deployments when
not configuring this parameter by default.
type: comma_delimited_list
NtpIburstEnable:
default: true
description: Specifies whether to enable the iburst option for every NTP
peer. If iburst is enabled, when the ntp server is unreachable
ntp will send a burst of eight packages instead of one. This
is designed to speed up the initial syncrhonization.
type: boolean
MaxPoll:
description: Specify maximum poll interval of upstream servers for NTP
messages, in seconds to the power of two.
The maximum poll interval defaults to 10 (1,024 s).
Allowed values are 4 to 17.
type: number
default: 10
constraints:
- range: { min: 4, max: 17 }
MinPoll:
description: Specify minimum poll interval of upstream servers for NTP
messages, in seconds to the power of two.
The minimum poll interval defaults to 6 (64 s).
Allowed values are 4 to 17.
type: number
default: 6
constraints:
- range: { min: 4, max: 17 }
EnablePackageInstall:
default: 'false'
description: Set to true to enable package installation at deploy time
type: boolean
outputs:
role_data:
description: Role ntp using composable services.
value:
service_name: ntp
config_settings:
ntp::servers: {get_param: NtpServer}
ntp::iburst_enable: {get_param: NtpIburstEnable}
ntp::maxpoll:: {get_param: MaxPoll}
ntp::minpoll:: {get_param: MinPoll}
tripleo::ntp::firewall_rules:
'105 ntp':
dport: 123
proto: udp
step_config: |
include ::tripleo::profile::base::time::ntp
host_prep_tasks:
- name: Populate service facts (ntp)
service_facts: # needed to make yaml happy
- name: Disable chronyd before configuring NTP
service:
name: chronyd
state: stopped
enabled: no
when: "'chronyd.service' in ansible_facts.services"
- name: Disable chrony-wait before configuring NTP
service:
name: chrony-wait
state: stopped
enabled: no
when: "'chrony-wait.service' in ansible_facts.services"
- name: NTP settings
set_fact:
ntp_servers: {get_param: NtpServer}
ntp_install_packages: {get_param: EnablePackageInstall}
- block:
- name: Install ntpdate
package:
name: ntpdate
state: present
when: ntp_install_packages|bool
- name: Ensure system is NTP time synced
command: ntpdate -u {{ ntp_servers | join(" ") }}
when: ntp_servers

1
environments/services/ptp.yaml
View File

@ -1,7 +1,6 @@
# A Heat environment file that can be used to deploy PTP service
resource_registry:
OS::TripleO::Services::Ntp: OS::Heat::None
# FIXME(bogdando): switch it, once it is containerized
OS::TripleO::Services::Ptp: ../../deployment/time/ptp-baremetal-puppet.yaml
OS::TripleO::Services::Timesync: OS::TripleO::Services::Ptp

1
overcloud-resource-registry-puppet.j2.yaml
View File

@ -235,7 +235,6 @@ resource_registry:
# Time sync services
OS::TripleO::Services::Chrony: deployment/timesync/chrony-baremetal-ansible.yaml
OS::TripleO::Services::Ntp: deployment/time/ntp-baremetal-puppet.yaml
OS::TripleO::Services::Ptp: OS::Heat::None
OS::TripleO::Services::Timesync: OS::TripleO::Services::Chrony

5
releasenotes/notes/remove-ntp-20905abec5281f54.yaml Normal file
View File

@ -0,0 +1,5 @@
---
upgrade:
- |
Removed the OS::TripleO::Services::Ntp service and related ntp files as
chrony is the new default.

6
sample-env-generator/composable-roles.yaml
View File

@ -22,7 +22,7 @@ environments:
- ControllerCount
- ComputeCount
- CephStorageCount
deployment/time/ntp-baremetal-puppet.yaml:
deployment/timesync/chrony-baremetal-ansible.yaml:
parameters:
- NtpServer
sample-env-generator/composable-roles.yaml:
@ -58,7 +58,7 @@ environments:
- ControllerCount
- ComputeCount
- CephStorageCount
deployment/time/ntp-baremetal-puppet.yaml:
deployment/timesync/chrony-baremetal-ansible.yaml:
parameters:
- NtpServer
sample-env-generator/composable-roles.yaml:
@ -93,7 +93,7 @@ environments:
- CephStorageHostnameFormat
- ComputeCount
- CephStorageCount
deployment/time/ntp-baremetal-puppet.yaml:
deployment/timesync/chrony-baremetal-ansible.yaml:
parameters:
- NtpServer
sample-env-generator/composable-roles.yaml:

4
sample-env-generator/standalone.yaml
View File

@ -28,7 +28,7 @@ environments:
deployment/swift/swift-storage-container-puppet.yaml:
parameters:
- SwiftReplicas
deployment/time/ntp-baremetal-puppet.yaml:
deployment/timesync/chrony-baremetal-ansible.yaml:
parameters:
- NtpServer
deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml:
@ -169,7 +169,7 @@ environments:
deployment/swift/swift-storage-container-puppet.yaml:
parameters:
- SwiftReplicas
deployment/time/ntp-baremetal-puppet.yaml:
deployment/timesync/chrony-baremetal-ansible.yaml:
parameters:
- NtpServer
# TODO(aschultz): hack to pull in this config transport, not sure it is