Create deployment/deprecated directory

It's not easy to find which services are deprecated, so let's create a
directory: deployment/deprecated and put the services in there.

This patch:
- creates the directory and a README
- moves already deprecated services into that directory
- update all references to these services to point to the right files

Change-Id: Id6c927d9c0db024875032f04228047d029c0696d

ci/environments/scenario001-multinode-containers.yaml

@@ -20,11 +20,11 @@ resource_registry:
   OS::TripleO::Services::CinderVolume: ../../deployment/cinder/cinder-volume-pacemaker-puppet.yaml
   OS::TripleO::Services::Keepalived: OS::Heat::None
   #Needs to run scenario001
-  OS::TripleO::Services::Fluentd: ../../deployment/logging/fluentd-container-puppet.yaml
+  OS::TripleO::Services::Fluentd: ../../deployment/deprecated/logging/fluentd-container-puppet.yaml
   # NOTE(mmagr): We need to disable Sensu client deployment for now as the container health check is based
   #  on successful RabbitMQ connection, which does not happen in this case. We can enable it again when we
   #  will implement default connection to overcloud RabbitMQ instance,
-  #OS::TripleO::Services::SensuClient: ../../deployment/monitoring/sensu-client-container-puppet.yaml
+  #OS::TripleO::Services::SensuClient: ../../deployment/deprecated/monitoring/sensu-client-container-puppet.yaml
   # Some infra instances don't pass the ping test but are otherwise working.
   # Since the OVB jobs also test this functionality we can shut it off here.
   OS::TripleO::AllNodes::Validation: ../common/all-nodes-validation-disabled.yaml

ci/environments/scenario001-standalone.yaml

@@ -10,7 +10,7 @@ resource_registry:
   OS::TripleO::Services::CephMon: ../../docker/services/ceph-ansible/ceph-mon.yaml
   OS::TripleO::Services::CephOSD: ../../docker/services/ceph-ansible/ceph-osd.yaml
   OS::TripleO::Services::CephClient: ../../docker/services/ceph-ansible/ceph-client.yaml
-  OS::TripleO::Services::PankoApi: ../../deployment/panko/panko-api-container-puppet.yaml
+  OS::TripleO::Services::PankoApi: ../../deployment/deprecated/panko/panko-api-container-puppet.yaml
   OS::TripleO::Services::Collectd: ../../deployment/metrics/collectd-container-puppet.yaml
   OS::TripleO::Services::GnocchiApi: ../../docker/services/gnocchi-api.yaml
   OS::TripleO::Services::GnocchiMetricd: ../../docker/services/gnocchi-metricd.yaml
@@ -26,11 +26,11 @@ resource_registry:
   OS::TripleO::Services::CinderBackup: ../../deployment/cinder/cinder-backup-container-puppet.yaml
   OS::TripleO::Services::CinderVolume: ../../deployment/cinder/cinder-volume-container-puppet.yaml
   #Needs to run scenario001
-  OS::TripleO::Services::Fluentd: ../../deployment/logging/fluentd-container-puppet.yaml
+  OS::TripleO::Services::Fluentd: ../../deployment/deprecated/logging/fluentd-container-puppet.yaml
   # NOTE(mmagr): We need to disable Sensu client deployment for now as the container health check is based
   #  on successful RabbitMQ connection, which does not happen in this case. We can enable it again when we
   #  will implement default connection to overcloud RabbitMQ instance,
-  #OS::TripleO::Services::SensuClient: ../../deployment/monitoring/sensu-client-container-puppet.yaml
+  #OS::TripleO::Services::SensuClient: ../../deployment/deprecated/monitoring/sensu-client-container-puppet.yaml
   # Some infra instances don't pass the ping test but are otherwise working.
   # Since the OVB jobs also test this functionality we can shut it off here.
   OS::TripleO::AllNodes::Validation: ../common/all-nodes-validation-disabled.yaml

ci/environments/scenario002-multinode-containers.yaml

@@ -4,7 +4,7 @@ resource_registry:
   OS::TripleO::Services::BarbicanApi: ../../deployment/barbican/barbican-api-container-puppet.yaml
   OS::TripleO::Services::Zaqar: ../../deployment/zaqar/zaqar-container-puppet.yaml
   OS::TripleO::Services::Ec2Api: ../../docker/services/ec2-api.yaml
-  OS::TripleO::Services::PankoApi: ../../deployment/panko/panko-api-container-puppet.yaml
+  OS::TripleO::Services::PankoApi: ../../deployment/deprecated/panko/panko-api-container-puppet.yaml
   OS::TripleO::Services::OsloMessagingRpc: ../../deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
   OS::TripleO::Services::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml
   OS::TripleO::Services::Redis: ../../docker/services/pacemaker/database/redis.yaml
@@ -20,7 +20,7 @@ resource_registry:
   # Some infra instances don't pass the ping test but are otherwise working.
   # Since the OVB jobs also test this functionality we can shut it off here.
   OS::TripleO::AllNodes::Validation: ../common/all-nodes-validation-disabled.yaml
-  OS::TripleO::Services::Fluentd: ../../deployment/logging/fluentd-container-puppet.yaml
+  OS::TripleO::Services::Fluentd: ../../deployment/deprecated/logging/fluentd-container-puppet.yaml
 
 parameter_defaults:
   ControllerServices:

ci/environments/scenario002-standalone.yaml

@@ -16,7 +16,7 @@ resource_registry:
   OS::TripleO::Services::BarbicanApi: ../../deployment/barbican/barbican-api-container-puppet.yaml
   OS::TripleO::Services::Zaqar: ../../deployment/zaqar/zaqar-container-puppet.yaml
   OS::TripleO::Services::Ec2Api: ../../docker/services/ec2-api.yaml
-  OS::TripleO::Services::PankoApi: ../../deployment/panko/panko-api-container-puppet.yaml
+  OS::TripleO::Services::PankoApi: ../../deployment/deprecated/panko/panko-api-container-puppet.yaml
   OS::TripleO::Services::OsloMessagingRpc: ../../deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml
   OS::TripleO::Services::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml
   OS::TripleO::Services::Redis: ../../docker/services/database/redis.yaml
@@ -26,7 +26,7 @@ resource_registry:
   # Some infra instances don't pass the ping test but are otherwise working.
   # Since the OVB jobs also test this functionality we can shut it off here.
   OS::TripleO::AllNodes::Validation: ../common/all-nodes-validation-disabled.yaml
-  OS::TripleO::Services::Fluentd: ../../deployment/logging/fluentd-container-puppet.yaml
+  OS::TripleO::Services::Fluentd: ../../deployment/deprecated/logging/fluentd-container-puppet.yaml
   OS::TripleO::Services::Horizon: OS::Heat::None
 
 parameter_defaults:

ci/environments/scenario004-standalone.yaml

@@ -28,7 +28,7 @@ resource_registry:
   # NOTE(mmagr): We need to disable Sensu client deployment for now as the container health check is based
   #  on successful RabbitMQ connection, which does not happen in this case. We can enable it again when we
   #  will implement default connection to overcloud RabbitMQ instance,
-  #OS::TripleO::Services::SensuClient: ../../deployment/monitoring/sensu-client-container-puppet.yaml
+  #OS::TripleO::Services::SensuClient: ../../deployment/deprecated/monitoring/sensu-client-container-puppet.yaml
   # Some infra instances don't pass the ping test but are otherwise working.
   # Since the OVB jobs also test this functionality we can shut it off here.
   OS::TripleO::AllNodes::Validation: ../common/all-nodes-validation-disabled.yaml

deployment/deprecated/README.rst

@@ -0,0 +1,6 @@
+===================
+Deprecated services
+===================
+
+This directory contains services that are deprecated and that will be
+removed in a future release.

deployment/deprecated/logging/fluentd-container-puppet.yaml

@@ -41,7 +41,7 @@ parameters:
 resources:
 
   ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../../../docker/services/containers-common.yaml
 
   LoggingConfiguration:
     type: OS::TripleO::LoggingConfiguration

deployment/deprecated/monitoring/sensu-client-container-puppet.yaml

@@ -93,7 +93,7 @@ conditions:
 
 resources:
   ContainersCommon:
-    type: ./containers-common.yaml
+    type: ../containers-common.yaml
 
   SensuBase:
     type: ./sensu-base.yaml

deployment/deprecated/panko/panko-api-container-puppet.yaml

@@ -109,13 +109,13 @@ conditions:
 resources:
 
   ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../../../docker/services/containers-common.yaml
 
   MySQLClient:
-    type: ../database/mysql-client.yaml
+    type: ../../database/mysql-client.yaml
 
   ApacheServiceBase:
-    type: ../../puppet/services/apache.yaml
+    type: ../../../puppet/services/apache.yaml
     properties:
       EndpointMap: {get_param: EndpointMap}
       ServiceData: {get_param: ServiceData}

environments/baremetal-services.yaml

@@ -47,7 +47,7 @@ resource_registry:
   OS::TripleO::Services::NovaPlacement: ../deployment/nova/nova-placement-container-puppet.yaml
   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::PankoApi: ../deployment/panko/panko-api-container-puppet.yaml
+  OS::TripleO::Services::PankoApi: ../deployment/deprecated/panko/panko-api-container-puppet.yaml
   OS::TripleO::Services::Qdr: OS::Heat::None
   OS::TripleO::Services::RabbitMQ: ../deployment/rabbitmq/rabbitmq-container-puppet.yaml
   OS::TripleO::Services::Redis: ../puppet/services/database/redis.yaml

environments/computealt.yaml

@@ -6,14 +6,14 @@ resource_registry:
   OS::TripleO::Services::ComputeNeutronOvsAgentAlt: ../deployment/neutron/neutron-ovs-agent-container-puppet.yaml
   OS::TripleO::Services::FluentdAlt: OS::Heat::None
   # If enabling fluentd you'll need provide the following in a specific resource_registry
-  # OS::TripleO::Services::FluentdAlt: ../deployment/logging/fluentd-container-puppet.yaml
+  # OS::TripleO::Services::FluentdAlt: ../deployment/deprecated/logging/fluentd-container-puppet.yaml
   OS::TripleO::Services::IscsidAlt: ../deployment/iscsid/iscsid-container-puppet.yaml
   OS::TripleO::Services::NovaComputeAlt: ../deployment/nova/nova-compute-container-puppet.yaml
   OS::TripleO::Services::NovaLibvirtAlt: ../deployment/nova/nova-libvirt-container-puppet.yaml
   OS::TripleO::Services::NovaMigrationTargetAlt: ../deployment/nova/nova-migration-target-container-puppet.yaml
   OS::TripleO::Services::SensuClientAlt: OS::Heat::None
   # If enabling monitoring you'll need provide the following in a specific resource_registry
-  # OS::TripleO::Services::SensuClientAlt: ../deployment/monitoring/sensu-client-container-puppet.yaml
+  # OS::TripleO::Services::SensuClientAlt: ../deployment/deprecated/monitoring/sensu-client-container-puppet.yaml
   OS::TripleO::Services::OVNControllerAlt: OS::Heat::None
   # If enabling OVN you'll need provide the following in a specific resource_registry
   # OS::TripleO::Services::OVNControllerAlt: ../puppet/services/ovn-controller.yaml

environments/logging-environment.yaml

@@ -1,8 +1,10 @@
+## DEPRECATED
+## Fluentd service is deprecated and will be removed in future releases.
 ## A Heat environment file which can be used to set up
 ## logging agents
 
 resource_registry:
-  OS::TripleO::Services::Fluentd: ../deployment/logging/fluentd-container-puppet.yaml
+  OS::TripleO::Services::Fluentd: ../deployment/deprecated/logging/fluentd-container-puppet.yaml
 
 #parameter_defaults:
 

environments/monitoring-environment.yaml

@@ -1,7 +1,9 @@
+## DEPRECATED
+## Sensu service is deprecated and will be removed in future releases.
 ## A Heat environment file which can be used to set up monitoring agents
 
 resource_registry:
-  OS::TripleO::Services::SensuClient: ../deployment/monitoring/sensu-client-container-puppet.yaml
+  OS::TripleO::Services::SensuClient: ../deployment/deprecated/monitoring/sensu-client-container-puppet.yaml
 
 #parameter_defaults:
 #  MonitoringRabbitHost: 10.10.10.10

environments/services-baremetal/fluentd.yaml

@@ -1,2 +1,2 @@
 resource_registry:
-  OS::TripleO::Services::Fluentd: ../../deployment/logging/fluentd-container-puppet.yaml
+  OS::TripleO::Services::Fluentd: ../../deployment/deprecated/logging/fluentd-container-puppet.yaml

environments/services-baremetal/sensu-client.yaml

@@ -1,3 +1,3 @@
 
 resource_registry:
-  OS::TripleO::Services::SensuClient: ../../deployment/monitoring/sensu-client-container-puppet.yaml
+  OS::TripleO::Services::SensuClient: ../../deployment/deprecated/monitoring/sensu-client-container-puppet.yaml

environments/services-baremetal/undercloud-panko.yaml

@@ -1,2 +1,2 @@
 resource_registry:
-  OS::TripleO::Services::UndercloudPankoApi: ../../deployment/panko/panko-api-container-puppet.yaml
+  OS::TripleO::Services::UndercloudPankoApi: ../../deployment/deprecated/panko/panko-api-container-puppet.yaml

environments/services/fluentd.yaml

@@ -1,2 +1,2 @@
 resource_registry:
-  OS::TripleO::Services::Fluentd: ../../deployment/logging/fluentd-container-puppet.yaml
+  OS::TripleO::Services::Fluentd: ../../deployment/deprecated/logging/fluentd-container-puppet.yaml

environments/services/sensu-client.yaml

@@ -1,3 +1,3 @@
 
 resource_registry:
-  OS::TripleO::Services::SensuClient: ../../deployment/monitoring/sensu-client-container-puppet.yaml
+  OS::TripleO::Services::SensuClient: ../../deployment/deprecated/monitoring/sensu-client-container-puppet.yaml

environments/services/undercloud-panko.yaml

@@ -1,4 +1,4 @@
 # DEPRECATED. This file will be removed in the Stein release as it is no longer
 # needed
 resource_registry:
-  OS::TripleO::Services::PankoApi: ../../deployment/panko/panko-api-container-puppet.yaml
+  OS::TripleO::Services::PankoApi: ../../deployment/deprecated/panko/panko-api-container-puppet.yaml

overcloud-resource-registry-puppet.j2.yaml

@@ -245,7 +245,7 @@ resource_registry:
   OS::TripleO::Services::TripleoValidations: OS::Heat::None
   OS::TripleO::Services::UndercloudUpgrade: OS::Heat::None
   OS::TripleO::Services::Collectd: OS::Heat::None
-  OS::TripleO::LoggingConfiguration: deployment/logging/fluentd-config.yaml
+  OS::TripleO::LoggingConfiguration: deployment/deprecated/logging/fluentd-config.yaml
   OS::TripleO::Services::ManilaApi: OS::Heat::None
   OS::TripleO::Services::ManilaScheduler: OS::Heat::None
   OS::TripleO::Services::ManilaShare: OS::Heat::None
@@ -266,7 +266,7 @@ resource_registry:
   OS::TripleO::Services::AodhEvaluator: deployment/aodh/aodh-evaluator-container-puppet.yaml
   OS::TripleO::Services::AodhListener: deployment/aodh/aodh-listener-container-puppet.yaml
   OS::TripleO::Services::AodhNotifier: deployment/aodh/aodh-notifier-container-puppet.yaml
-  OS::TripleO::Services::PankoApi: deployment/panko/panko-api-container-puppet.yaml
+  OS::TripleO::Services::PankoApi: deployment/deprecated/panko/panko-api-container-puppet.yaml
   OS::TripleO::Services::MetricsQdr: OS::Heat::None
   OS::TripleO::Services::MistralEngine: OS::Heat::None
   OS::TripleO::Services::MistralApi: OS::Heat::None

releasenotes/notes/deprecated_services-172a1ae6348e6c52.yaml

@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    Deprecated services now live in deployment/deprecated directory.