diff --git a/docker/services/logging/files/barbican-api.yaml b/deployment/logging/files/barbican-api.yaml similarity index 100% rename from docker/services/logging/files/barbican-api.yaml rename to deployment/logging/files/barbican-api.yaml diff --git a/docker/services/logging/files/haproxy.yaml b/deployment/logging/files/haproxy.yaml similarity index 100% rename from docker/services/logging/files/haproxy.yaml rename to deployment/logging/files/haproxy.yaml diff --git a/docker/services/logging/files/heat-api-cfn.yaml b/deployment/logging/files/heat-api-cfn.yaml similarity index 100% rename from docker/services/logging/files/heat-api-cfn.yaml rename to deployment/logging/files/heat-api-cfn.yaml diff --git a/docker/services/logging/files/heat-api.yaml b/deployment/logging/files/heat-api.yaml similarity index 100% rename from docker/services/logging/files/heat-api.yaml rename to deployment/logging/files/heat-api.yaml diff --git a/docker/services/logging/files/heat-engine.yaml b/deployment/logging/files/heat-engine.yaml similarity index 100% rename from docker/services/logging/files/heat-engine.yaml rename to deployment/logging/files/heat-engine.yaml diff --git a/docker/services/logging/files/keystone.yaml b/deployment/logging/files/keystone.yaml similarity index 100% rename from docker/services/logging/files/keystone.yaml rename to deployment/logging/files/keystone.yaml diff --git a/docker/services/logging/files/neutron-api.yaml b/deployment/logging/files/neutron-api.yaml similarity index 100% rename from docker/services/logging/files/neutron-api.yaml rename to deployment/logging/files/neutron-api.yaml diff --git a/docker/services/logging/files/neutron-common.yaml b/deployment/logging/files/neutron-common.yaml similarity index 100% rename from docker/services/logging/files/neutron-common.yaml rename to deployment/logging/files/neutron-common.yaml diff --git a/docker/services/logging/files/nova-api.yaml b/deployment/logging/files/nova-api.yaml similarity index 100% rename from docker/services/logging/files/nova-api.yaml rename to deployment/logging/files/nova-api.yaml diff --git a/docker/services/logging/files/nova-common.yaml b/deployment/logging/files/nova-common.yaml similarity index 100% rename from docker/services/logging/files/nova-common.yaml rename to deployment/logging/files/nova-common.yaml diff --git a/docker/services/logging/files/nova-metadata.yaml b/deployment/logging/files/nova-metadata.yaml similarity index 100% rename from docker/services/logging/files/nova-metadata.yaml rename to deployment/logging/files/nova-metadata.yaml diff --git a/docker/services/logging/files/nova-placement.yaml b/deployment/logging/files/nova-placement.yaml similarity index 100% rename from docker/services/logging/files/nova-placement.yaml rename to deployment/logging/files/nova-placement.yaml diff --git a/docker/services/logging/files/opendaylight-api.yaml b/deployment/logging/files/opendaylight-api.yaml similarity index 100% rename from docker/services/logging/files/opendaylight-api.yaml rename to deployment/logging/files/opendaylight-api.yaml diff --git a/docker/services/logging/files/panko-api.yaml b/deployment/logging/files/panko-api.yaml similarity index 100% rename from docker/services/logging/files/panko-api.yaml rename to deployment/logging/files/panko-api.yaml diff --git a/docker/services/rsyslog-sidecar.yaml b/deployment/logging/rsyslog-sidecar-container-puppet.yaml similarity index 97% rename from docker/services/rsyslog-sidecar.yaml rename to deployment/logging/rsyslog-sidecar-container-puppet.yaml index 29e0876810..c778cc687b 100644 --- a/docker/services/rsyslog-sidecar.yaml +++ b/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: diff --git a/docker/services/logging/stdout/barbican-api.yaml b/deployment/logging/stdout/barbican-api.yaml similarity index 100% rename from docker/services/logging/stdout/barbican-api.yaml rename to deployment/logging/stdout/barbican-api.yaml diff --git a/docker/services/logging/stdout/haproxy.yaml b/deployment/logging/stdout/haproxy.yaml similarity index 100% rename from docker/services/logging/stdout/haproxy.yaml rename to deployment/logging/stdout/haproxy.yaml diff --git a/docker/services/logging/stdout/heat-api-cfn.yaml b/deployment/logging/stdout/heat-api-cfn.yaml similarity index 100% rename from docker/services/logging/stdout/heat-api-cfn.yaml rename to deployment/logging/stdout/heat-api-cfn.yaml diff --git a/docker/services/logging/stdout/heat-api.yaml b/deployment/logging/stdout/heat-api.yaml similarity index 100% rename from docker/services/logging/stdout/heat-api.yaml rename to deployment/logging/stdout/heat-api.yaml diff --git a/docker/services/logging/stdout/heat-engine.yaml b/deployment/logging/stdout/heat-engine.yaml similarity index 100% rename from docker/services/logging/stdout/heat-engine.yaml rename to deployment/logging/stdout/heat-engine.yaml diff --git a/docker/services/logging/stdout/keystone.yaml b/deployment/logging/stdout/keystone.yaml similarity index 100% rename from docker/services/logging/stdout/keystone.yaml rename to deployment/logging/stdout/keystone.yaml diff --git a/docker/services/logging/stdout/neutron-common.yaml b/deployment/logging/stdout/neutron-common.yaml similarity index 100% rename from docker/services/logging/stdout/neutron-common.yaml rename to deployment/logging/stdout/neutron-common.yaml diff --git a/docker/services/logging/stdout/nova-api.yaml b/deployment/logging/stdout/nova-api.yaml similarity index 100% rename from docker/services/logging/stdout/nova-api.yaml rename to deployment/logging/stdout/nova-api.yaml diff --git a/docker/services/logging/stdout/nova-common.yaml b/deployment/logging/stdout/nova-common.yaml similarity index 100% rename from docker/services/logging/stdout/nova-common.yaml rename to deployment/logging/stdout/nova-common.yaml diff --git a/docker/services/logging/stdout/nova-libvirt.yaml b/deployment/logging/stdout/nova-libvirt.yaml similarity index 100% rename from docker/services/logging/stdout/nova-libvirt.yaml rename to deployment/logging/stdout/nova-libvirt.yaml diff --git a/docker/services/logging/stdout/nova-metadata.yaml b/deployment/logging/stdout/nova-metadata.yaml similarity index 100% rename from docker/services/logging/stdout/nova-metadata.yaml rename to deployment/logging/stdout/nova-metadata.yaml diff --git a/docker/services/logging/stdout/nova-placement.yaml b/deployment/logging/stdout/nova-placement.yaml similarity index 100% rename from docker/services/logging/stdout/nova-placement.yaml rename to deployment/logging/stdout/nova-placement.yaml diff --git a/docker/services/logging/stdout/panko-api.yaml b/deployment/logging/stdout/panko-api.yaml similarity index 100% rename from docker/services/logging/stdout/panko-api.yaml rename to deployment/logging/stdout/panko-api.yaml diff --git a/environments/stdout-logging.yaml b/environments/stdout-logging.yaml index dc717bbdd9..4aa69639cf 100644 --- a/environments/stdout-logging.yaml +++ b/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 diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index 4ac2daf315..9b727e01ac 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/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