Flatten and move logrotate-crond service container

Change-Id: Ifcb5b0e940e73fb78cd1a9e659b4a22890688198

deployment/logrotate/logrotate-crond-container-puppet.yaml

@@ -58,8 +58,7 @@ parameters:
 resources:
 
   ContainersCommon:
-    type: ./containers-common.yaml
-
+    type: ../../docker/services/containers-common.yaml
 outputs:
   role_data:
     description: Role data for the crond role.

environments/docker-uc-light.yaml

@@ -6,7 +6,7 @@ resource_registry:
   # see https://review.openstack.org/#/c/563443
   OS::TripleO::Docker::NeutronMl2PluginBase: ../puppet/services/neutron-plugin-ml2.yaml
 
-  OS::TripleO::Services::ContainersLogrotateCrond: ../docker/services/logrotate-crond.yaml
+  OS::TripleO::Services::ContainersLogrotateCrond: ../deployment/logrotate/logrotate-crond-container-puppet.yaml
   OS::TripleO::Services::HeatApi: ../deployment/heat/heat-api-container-puppet.yaml
   OS::TripleO::Services::HeatApiCfn: ../deployment/heat/heat-api-cfn-container-puppet.yaml
   OS::TripleO::Services::HeatEngine: ../deployment/heat/heat-engine-container-puppet.yaml

overcloud-resource-registry-puppet.j2.yaml

@@ -202,7 +202,7 @@ resource_registry:
   OS::TripleO::Services::NovaScheduler: deployment/nova/nova-scheduler-container-puppet.yaml
   OS::TripleO::Services::NovaVncProxy: deployment/nova/nova-vnc-proxy-container-puppet.yaml
   OS::TripleO::Services::Novajoin: OS::Heat::None
-  OS::TripleO::Services::ContainersLogrotateCrond: docker/services/logrotate-crond.yaml
+  OS::TripleO::Services::ContainersLogrotateCrond: deployment/logrotate/logrotate-crond-container-puppet.yaml
   OS::TripleO::Services::OpenShift::Master: OS::Heat::None
   OS::TripleO::Services::OpenShift::Worker: OS::Heat::None
   OS::TripleO::Services::OpenShift::Infra: OS::Heat::None