From cd331e44beefa98f6add073e716f814f6f3a8260 Mon Sep 17 00:00:00 2001
From: David J Peacock <david.j.peacock@gmail.com>
Date: Tue, 18 Dec 2018 10:41:15 -0500
Subject: [PATCH] flatten time service configuration

This change combines the previous puppet and docker files into a single
file that performs the docker service installation and configuration.

Change-Id: I6a9123627d754a153ab6cb68a33778a57846aeb7
Related-Blueprint: services-yaml-flattening
---
 .../ntp.yaml => deployment/time/ntp-baremetal-puppet.yaml   | 0
 .../ptp.yaml => deployment/time/ptp-baremetal-puppet.yaml   | 0
 .../time/timezone-baremetal-puppet.yaml                     | 0
 environments/services/ptp.yaml                              | 2 +-
 overcloud-resource-registry-puppet.j2.yaml                  | 4 ++--
 sample-env-generator/composable-roles.yaml                  | 6 +++---
 sample-env-generator/standalone.yaml                        | 4 ++--
 7 files changed, 8 insertions(+), 8 deletions(-)
 rename puppet/services/time/ntp.yaml => deployment/time/ntp-baremetal-puppet.yaml (100%)
 rename puppet/services/time/ptp.yaml => deployment/time/ptp-baremetal-puppet.yaml (100%)
 rename puppet/services/time/timezone.yaml => deployment/time/timezone-baremetal-puppet.yaml (100%)

diff --git a/puppet/services/time/ntp.yaml b/deployment/time/ntp-baremetal-puppet.yaml
similarity index 100%
rename from puppet/services/time/ntp.yaml
rename to deployment/time/ntp-baremetal-puppet.yaml
diff --git a/puppet/services/time/ptp.yaml b/deployment/time/ptp-baremetal-puppet.yaml
similarity index 100%
rename from puppet/services/time/ptp.yaml
rename to deployment/time/ptp-baremetal-puppet.yaml
diff --git a/puppet/services/time/timezone.yaml b/deployment/time/timezone-baremetal-puppet.yaml
similarity index 100%
rename from puppet/services/time/timezone.yaml
rename to deployment/time/timezone-baremetal-puppet.yaml
diff --git a/environments/services/ptp.yaml b/environments/services/ptp.yaml
index 8fdbf2ae8e..d1b05eb4b1 100644
--- a/environments/services/ptp.yaml
+++ b/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:
diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml
index aae44a8b18..6df163836d 100644
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@@ -216,7 +216,7 @@ resource_registry:
   OS::TripleO::Services::SwiftRingBuilder: docker/services/swift-ringbuilder.yaml
   OS::TripleO::Services::Snmp: puppet/services/snmp.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
@@ -231,7 +231,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
 
diff --git a/sample-env-generator/composable-roles.yaml b/sample-env-generator/composable-roles.yaml
index 3ae6ba7e42..912a1e0352 100644
--- a/sample-env-generator/composable-roles.yaml
+++ b/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:
diff --git a/sample-env-generator/standalone.yaml b/sample-env-generator/standalone.yaml
index ae5ac177e1..ee2e1c4fe9 100644
--- a/sample-env-generator/standalone.yaml
+++ b/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:
@@ -162,7 +162,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