Merge "flatten time service configuration"

This commit is contained in:
Zuul 2019-01-08 03:37:03 +00:00 committed by Gerrit Code Review
commit e9de300da2
7 changed files with 8 additions and 8 deletions

View File

@ -3,7 +3,7 @@
resource_registry: resource_registry:
OS::TripleO::Services::Ntp: OS::Heat::None OS::TripleO::Services::Ntp: OS::Heat::None
# FIXME(bogdando): switch it, once it is containerized # FIXME(bogdando): switch it, once it is containerized
OS::TripleO::Services::Ptp: ../../puppet/services/time/ptp.yaml OS::TripleO::Services::Ptp: ../../deployment/time/ptp-baremetal-puppet.yaml
OS::TripleO::Services::Timesync: OS::TripleO::Services::Ptp OS::TripleO::Services::Timesync: OS::TripleO::Services::Ptp
parameter_defaults: parameter_defaults:

View File

@ -215,7 +215,7 @@ resource_registry:
OS::TripleO::Services::SwiftRingBuilder: docker/services/swift-ringbuilder.yaml OS::TripleO::Services::SwiftRingBuilder: docker/services/swift-ringbuilder.yaml
OS::TripleO::Services::Snmp: deployment/snmp/snmp-baremetal-puppet.yaml OS::TripleO::Services::Snmp: deployment/snmp/snmp-baremetal-puppet.yaml
OS::TripleO::Services::Tacker: OS::Heat::None OS::TripleO::Services::Tacker: OS::Heat::None
OS::TripleO::Services::Timezone: puppet/services/time/timezone.yaml OS::TripleO::Services::Timezone: deployment/time/timezone-baremetal-puppet.yaml
OS::TripleO::Services::CeilometerAgentCentral: docker/services/ceilometer-agent-central.yaml OS::TripleO::Services::CeilometerAgentCentral: docker/services/ceilometer-agent-central.yaml
OS::TripleO::Services::CeilometerAgentIpmi: docker/services/ceilometer-agent-ipmi.yaml OS::TripleO::Services::CeilometerAgentIpmi: docker/services/ceilometer-agent-ipmi.yaml
OS::TripleO::Services::CeilometerAgentNotification: docker/services/ceilometer-agent-notification.yaml OS::TripleO::Services::CeilometerAgentNotification: docker/services/ceilometer-agent-notification.yaml
@ -230,7 +230,7 @@ resource_registry:
# Time sync services # Time sync services
OS::TripleO::Services::Chrony: deployment/timesync/chrony-baremetal-ansible.yaml OS::TripleO::Services::Chrony: deployment/timesync/chrony-baremetal-ansible.yaml
OS::TripleO::Services::Ntp: puppet/services/time/ntp.yaml OS::TripleO::Services::Ntp: deployment/time/ntp-baremetal-puppet.yaml
OS::TripleO::Services::Ptp: OS::Heat::None OS::TripleO::Services::Ptp: OS::Heat::None
OS::TripleO::Services::Timesync: OS::TripleO::Services::Chrony OS::TripleO::Services::Timesync: OS::TripleO::Services::Chrony

View File

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

View File

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