Browse Source

Merge "flatten time service configuration"

changes/73/626573/3
Zuul 3 years ago committed by Gerrit Code Review
parent
commit
e9de300da2
  1. 0
      deployment/time/ntp-baremetal-puppet.yaml
  2. 0
      deployment/time/ptp-baremetal-puppet.yaml
  3. 0
      deployment/time/timezone-baremetal-puppet.yaml
  4. 2
      environments/services/ptp.yaml
  5. 4
      overcloud-resource-registry-puppet.j2.yaml
  6. 6
      sample-env-generator/composable-roles.yaml
  7. 4
      sample-env-generator/standalone.yaml

0
puppet/services/time/ntp.yaml → deployment/time/ntp-baremetal-puppet.yaml

0
puppet/services/time/ptp.yaml → deployment/time/ptp-baremetal-puppet.yaml

0
puppet/services/time/timezone.yaml → deployment/time/timezone-baremetal-puppet.yaml

2
environments/services/ptp.yaml

@ -3,7 +3,7 @@
resource_registry:
OS::TripleO::Services::Ntp: OS::Heat::None
# 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
parameter_defaults:

4
overcloud-resource-registry-puppet.j2.yaml

@ -215,7 +215,7 @@ resource_registry:
OS::TripleO::Services::SwiftRingBuilder: docker/services/swift-ringbuilder.yaml
OS::TripleO::Services::Snmp: deployment/snmp/snmp-baremetal-puppet.yaml
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::CeilometerAgentIpmi: docker/services/ceilometer-agent-ipmi.yaml
OS::TripleO::Services::CeilometerAgentNotification: docker/services/ceilometer-agent-notification.yaml
@ -230,7 +230,7 @@ resource_registry:
# Time sync services
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::Timesync: OS::TripleO::Services::Chrony

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

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

4
sample-env-generator/standalone.yaml

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

Loading…
Cancel
Save