Merge "move logging into deployment"

deployment/logging/rsyslog-sidecar-container-puppet.yaml

@@ -37,7 +37,7 @@ parameters:
 resources:
 
   ContainersCommon:
-    type: ./containers-common.yaml
+    type: ../../docker/services/containers-common.yaml
 
 outputs:
   role_data:

environments/stdout-logging.yaml

@@ -1,18 +1,18 @@
 resource_registry:
-  OS::TripleO::Services::RsyslogSidecar: ../docker/services/rsyslog-sidecar.yaml
+  OS::TripleO::Services::RsyslogSidecar: ../deployment/logging/rsyslog-sidecar-container-puppet.yaml
 
-  OS::TripleO::Services::Logging::BarbicanApi: ../docker/services/logging/stdout/barbican-api.yaml
+  OS::TripleO::Services::Logging::BarbicanApi: ../deployment/logging/stdout/barbican-api.yaml
   OS::TripleO::Services::Logging::GlanceApi: ../deployment/glance/glance-api-stdout-file.yaml
-  OS::TripleO::Services::Logging::HAProxy: ../docker/services/logging/stdout/haproxy.yaml
-  OS::TripleO::Services::Logging::HeatApi: ../docker/services/logging/stdout/heat-api.yaml
-  OS::TripleO::Services::Logging::HeatApiCfn: ../docker/services/logging/stdout/heat-api-cfn.yaml
-  OS::TripleO::Services::Logging::HeatEngine: ../docker/services/logging/stdout/heat-engine.yaml
-  OS::TripleO::Services::Logging::Keystone: ../docker/services/logging/stdout/keystone.yaml
-  OS::TripleO::Services::Logging::NeutronApi: ../docker/services/logging/stdout/neutron-common.yaml
-  OS::TripleO::Services::Logging::NeutronCommon: ../docker/services/logging/stdout/neutron-common.yaml
-  OS::TripleO::Services::Logging::NovaApi: ../docker/services/logging/stdout/nova-api.yaml
-  OS::TripleO::Services::Logging::NovaCommon: ../docker/services/logging/stdout/nova-common.yaml
-  OS::TripleO::Services::Logging::NovaPlacement: ../docker/services/logging/stdout/nova-placement.yaml
-  OS::TripleO::Services::Logging::NovaMetadata: ../docker/services/logging/stdout/nova-metadata.yaml
-  OS::TripleO::Services::Logging::NovaLibvirt: ../docker/services/logging/stdout/nova-libvirt.yaml
-  OS::TripleO::Services::Logging::PankoApi: ../docker/services/logging/stdout/panko-api.yaml
+  OS::TripleO::Services::Logging::HAProxy: ../deployment/logging/stdout/haproxy.yaml
+  OS::TripleO::Services::Logging::HeatApi: ../deployment/logging/stdout/heat-api.yaml
+  OS::TripleO::Services::Logging::HeatApiCfn: ../deployment/logging/stdout/heat-api-cfn.yaml
+  OS::TripleO::Services::Logging::HeatEngine: ../deployment/logging/stdout/heat-engine.yaml
+  OS::TripleO::Services::Logging::Keystone: ../deployment/logging/stdout/keystone.yaml
+  OS::TripleO::Services::Logging::NeutronApi: ../deployment/logging/stdout/neutron-common.yaml
+  OS::TripleO::Services::Logging::NeutronCommon: ../deployment/logging/stdout/neutron-common.yaml
+  OS::TripleO::Services::Logging::NovaApi: ../deployment/logging/stdout/nova-api.yaml
+  OS::TripleO::Services::Logging::NovaCommon: ../deployment/logging/stdout/nova-common.yaml
+  OS::TripleO::Services::Logging::NovaPlacement: ../deployment/logging/stdout/nova-placement.yaml
+  OS::TripleO::Services::Logging::NovaMetadata: ../deployment/logging/stdout/nova-metadata.yaml
+  OS::TripleO::Services::Logging::NovaLibvirt: ../deployment/logging/stdout/nova-libvirt.yaml
+  OS::TripleO::Services::Logging::PankoApi: ../deployment/logging/stdout/panko-api.yaml

overcloud-resource-registry-puppet.j2.yaml

@@ -335,22 +335,22 @@ resource_registry:
 
   # Logging
   OS::TripleO::Services::Tmpwatch: OS::Heat::None
-  OS::TripleO::Services::Logging::BarbicanApi: docker/services/logging/files/barbican-api.yaml
+  OS::TripleO::Services::Logging::BarbicanApi: deployment/logging/files/barbican-api.yaml
   OS::TripleO::Services::Logging::GlanceApi: deployment/glance/glance-api-logging-file-container.yaml
-  OS::TripleO::Services::Logging::HAProxy: docker/services/logging/files/haproxy.yaml
-  OS::TripleO::Services::Logging::HeatApi: docker/services/logging/files/heat-api.yaml
-  OS::TripleO::Services::Logging::HeatApiCfn: docker/services/logging/files/heat-api-cfn.yaml
-  OS::TripleO::Services::Logging::HeatEngine: docker/services/logging/files/heat-engine.yaml
-  OS::TripleO::Services::Logging::Keystone: docker/services/logging/files/keystone.yaml
-  OS::TripleO::Services::Logging::NeutronApi: docker/services/logging/files/neutron-api.yaml
-  OS::TripleO::Services::Logging::NeutronCommon: docker/services/logging/files/neutron-common.yaml
-  OS::TripleO::Services::Logging::NovaApi: docker/services/logging/files/nova-api.yaml
-  OS::TripleO::Services::Logging::NovaMetadata: docker/services/logging/files/nova-metadata.yaml
-  OS::TripleO::Services::Logging::NovaCommon: docker/services/logging/files/nova-common.yaml
+  OS::TripleO::Services::Logging::HAProxy: deployment/logging/files/haproxy.yaml
+  OS::TripleO::Services::Logging::HeatApi: deployment/logging/files/heat-api.yaml
+  OS::TripleO::Services::Logging::HeatApiCfn: deployment/logging/files/heat-api-cfn.yaml
+  OS::TripleO::Services::Logging::HeatEngine: deployment/logging/files/heat-engine.yaml
+  OS::TripleO::Services::Logging::Keystone: deployment/logging/files/keystone.yaml
+  OS::TripleO::Services::Logging::NeutronApi: deployment/logging/files/neutron-api.yaml
+  OS::TripleO::Services::Logging::NeutronCommon: deployment/logging/files/neutron-common.yaml
+  OS::TripleO::Services::Logging::NovaApi: deployment/logging/files/nova-api.yaml
+  OS::TripleO::Services::Logging::NovaMetadata: deployment/logging/files/nova-metadata.yaml
+  OS::TripleO::Services::Logging::NovaCommon: deployment/logging/files/nova-common.yaml
   OS::TripleO::Services::Logging::NovaLibvirt: OS::Heat::None
-  OS::TripleO::Services::Logging::NovaPlacement: docker/services/logging/files/nova-placement.yaml
+  OS::TripleO::Services::Logging::NovaPlacement: deployment/logging/files/nova-placement.yaml
   OS::TripleO::Services::Logging::OpenDaylightApi: deployment/deprecated/opendaylight/opendaylight-api-container-puppet.yaml
-  OS::TripleO::Services::Logging::PankoApi: docker/services/logging/files/panko-api.yaml
+  OS::TripleO::Services::Logging::PankoApi: deployment/logging/files/panko-api.yaml
 
   # Tempest
   OS::TripleO::Services::Tempest: OS::Heat::None