Flatten rabbitmq service - step 2

Now that we could get rid of the puppet dedicated definitions,
we can move the docker/* rabbitmq related stuff to the final
location, and correct the paths and some nits.

Change-Id: I47ca1e303bd38642200ccb7f6823bcd06cd00255

ci/environments/multinode-3nodes-registry.yaml

@@ -2,8 +2,8 @@ resource_registry:
   OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode-os-net-config.yaml
   OS::TripleO::ControllerApi::Net::SoftwareConfig: ../common/net-config-multinode-os-net-config.yaml
   OS::TripleO::Services::Core: multinode-core.yaml
-  OS::TripleO::Services::OsloMessagingRpc: ../../docker/services/pacemaker/rpc-rabbitmq.yaml
+  OS::TripleO::Services::OsloMessagingRpc: ../../deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
-  OS::TripleO::Services::OsloMessagingNotify: ../../docker/services/messaging/notify-rabbitmq-shared.yaml
+  OS::TripleO::Services::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml
   OS::TripleO::Services::HAproxy: ../../deployment/haproxy/haproxy-pacemaker-puppet.yaml
   OS::TripleO::Services::Pacemaker: ../../puppet/services/pacemaker.yaml
   OS::TripleO::Services::PacemakerRemote: ../../puppet/services/pacemaker_remote.yaml

ci/environments/scenario000-multinode-containers.yaml

@@ -5,8 +5,8 @@ resource_registry:
   # 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::OsloMessagingRpc: ../../docker/services/pacemaker/rpc-rabbitmq.yaml
+  OS::TripleO::Services::OsloMessagingRpc: ../../deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
-  OS::TripleO::Services::OsloMessagingNotify: ../../docker/services/messaging/notify-rabbitmq-shared.yaml
+  OS::TripleO::Services::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml
   OS::TripleO::Services::HAproxy: ../../deployment/haproxy/haproxy-pacemaker-puppet.yaml
   OS::TripleO::Services::Pacemaker: ../../puppet/services/pacemaker.yaml
   OS::TripleO::Services::PacemakerRemote: ../../puppet/services/pacemaker_remote.yaml

ci/environments/scenario001-multinode-containers.yaml

@@ -8,8 +8,8 @@ resource_registry:
   OS::TripleO::Services::PankoApi: ../../deployment/panko/panko-api-container-puppet.yaml
   OS::TripleO::Services::Collectd: ../../docker/services/metrics/collectd.yaml
   OS::TripleO::Services::MetricsQdr: ../../docker/services/metrics/qdr.yaml
-  OS::TripleO::Services::OsloMessagingRpc: ../../docker/services/pacemaker/rpc-rabbitmq.yaml
+  OS::TripleO::Services::OsloMessagingRpc: ../../deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
-  OS::TripleO::Services::OsloMessagingNotify: ../../docker/services/messaging/notify-rabbitmq-shared.yaml
+  OS::TripleO::Services::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml
   OS::TripleO::Services::HAproxy: ../../deployment/haproxy/haproxy-pacemaker-puppet.yaml
   OS::TripleO::Services::Pacemaker: ../../puppet/services/pacemaker.yaml
   OS::TripleO::Services::PacemakerRemote: ../../puppet/services/pacemaker_remote.yaml

ci/environments/scenario001-standalone.yaml

@@ -20,8 +20,8 @@ resource_registry:
   OS::TripleO::Services::HeatApiCloudwatch: ../../deployment/heat/heat-api-cloudwatch-disabled-puppet.yaml
   OS::TripleO::Services::HeatEngine: ../../deployment/heat/heat-engine-container-puppet.yaml
   OS::TripleO::Services::MetricsQdr: ../../docker/services/metrics/qdr.yaml
-  OS::TripleO::Services::OsloMessagingRpc: ../../docker/services/pacemaker/rpc-rabbitmq.yaml
+  OS::TripleO::Services::OsloMessagingRpc: ../../deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
-  OS::TripleO::Services::OsloMessagingNotify: ../../docker/services/messaging/notify-rabbitmq-shared.yaml
+  OS::TripleO::Services::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml
   OS::TripleO::Services::HAproxy: ../../deployment/haproxy/haproxy-pacemaker-puppet.yaml
   OS::TripleO::Services::Pacemaker: ../../puppet/services/pacemaker.yaml
   OS::TripleO::Services::PacemakerRemote: ../../puppet/services/pacemaker_remote.yaml

ci/environments/scenario002-multinode-containers.yaml

@@ -5,8 +5,8 @@ resource_registry:
   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::OsloMessagingRpc: ../../docker/services/pacemaker/rpc-rabbitmq.yaml
+  OS::TripleO::Services::OsloMessagingRpc: ../../deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
-  OS::TripleO::Services::OsloMessagingNotify: ../../docker/services/messaging/notify-rabbitmq-shared.yaml
+  OS::TripleO::Services::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml
   OS::TripleO::Services::Redis: ../../docker/services/pacemaker/database/redis.yaml
   OS::TripleO::Services::HAproxy: ../../deployment/haproxy/haproxy-pacemaker-puppet.yaml
   OS::TripleO::Services::Pacemaker: ../../puppet/services/pacemaker.yaml

ci/environments/scenario002-standalone.yaml

@@ -17,8 +17,8 @@ resource_registry:
   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::OsloMessagingRpc: ../../docker/services/pacemaker/rpc-rabbitmq.yaml
+  OS::TripleO::Services::OsloMessagingRpc: ../../deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
-  OS::TripleO::Services::OsloMessagingNotify: ../../docker/services/messaging/notify-rabbitmq-shared.yaml
+  OS::TripleO::Services::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml
   OS::TripleO::Services::Redis: ../../docker/services/pacemaker/database/redis.yaml
   OS::TripleO::Services::HAproxy: ../../deployment/haproxy/haproxy-pacemaker-puppet.yaml
   OS::TripleO::Services::Pacemaker: ../../puppet/services/pacemaker.yaml

ci/environments/scenario003-multinode-containers.yaml

@@ -8,7 +8,7 @@ resource_registry:
   OS::TripleO::Services::MistralExecutor: ../../deployment/mistral/mistral-executor-container-puppet.yaml
   OS::TripleO::Services::MistralEventEngine: ../../deployment/mistral/mistral-event-engine-container-puppet.yaml
   OS::TripleO::Services::OsloMessagingRpc: ../../docker/services/messaging/rpc-qdrouterd.yaml
-  OS::TripleO::Services::OsloMessagingNotify: ../../docker/services/pacemaker/notify-rabbitmq.yaml
+  OS::TripleO::Services::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml
   OS::TripleO::Services::HAproxy: ../../deployment/haproxy/haproxy-pacemaker-puppet.yaml
   OS::TripleO::Services::Pacemaker: ../../puppet/services/pacemaker.yaml
   OS::TripleO::Services::PacemakerRemote: ../../puppet/services/pacemaker_remote.yaml

ci/environments/scenario003-standalone.yaml

@@ -13,7 +13,7 @@ resource_registry:
   OS::TripleO::Services::MistralExecutor: ../../deployment/mistral/mistral-executor-container-puppet.yaml
   OS::TripleO::Services::MistralEventEngine: ../../deployment/mistral/mistral-event-engine-container-puppet.yaml
   OS::TripleO::Services::OsloMessagingRpc: ../../docker/services/messaging/rpc-qdrouterd.yaml
-  OS::TripleO::Services::OsloMessagingNotify: ../../docker/services/pacemaker/notify-rabbitmq.yaml
+  OS::TripleO::Services::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml
   OS::TripleO::Services::HAproxy: ../../deployment/haproxy/haproxy-pacemaker-puppet.yaml
   OS::TripleO::Services::Pacemaker: ../../puppet/services/pacemaker.yaml
   OS::TripleO::Services::PacemakerRemote: ../../puppet/services/pacemaker_remote.yaml

ci/environments/scenario004-multinode-containers.yaml

@@ -21,8 +21,8 @@ resource_registry:
   # OS::TripleO::Services::NeutronL2gwApi: ../../puppet/services/neutron-l2gw-api.yaml
   # OS::TripleO::Services::NeutronL2gwAgent: ../../puppet/services/neutron-l2gw-agent.yaml
   # These enable Pacemaker
-  OS::TripleO::Services::OsloMessagingRpc: ../../docker/services/pacemaker/rpc-rabbitmq.yaml
+  OS::TripleO::Services::OsloMessagingRpc: ../../deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
-  OS::TripleO::Services::OsloMessagingNotify: ../../docker/services/messaging/notify-rabbitmq-shared.yaml
+  OS::TripleO::Services::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml
   OS::TripleO::Services::HAproxy: ../../deployment/haproxy/haproxy-pacemaker-puppet.yaml
   OS::TripleO::Services::Pacemaker: ../../puppet/services/pacemaker.yaml
   OS::TripleO::Services::PacemakerRemote: ../../puppet/services/pacemaker_remote.yaml

ci/environments/scenario004-standalone.yaml

@@ -17,8 +17,8 @@ resource_registry:
   OS::TripleO::Services::ManilaScheduler: ../../deployment/manila/manila-scheduler-container-puppet.yaml
   OS::TripleO::Services::ManilaShare: ../../deployment/manila/manila-share-pacemaker-puppet.yaml
   OS::TripleO::Services::ManilaBackendCephFs: ../../puppet/services/manila-backend-cephfs.yaml
-  OS::TripleO::Services::OsloMessagingRpc: ../../docker/services/pacemaker/rpc-rabbitmq.yaml
+  OS::TripleO::Services::OsloMessagingRpc: ../../deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
-  OS::TripleO::Services::OsloMessagingNotify: ../../docker/services/messaging/notify-rabbitmq-shared.yaml
+  OS::TripleO::Services::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml
   OS::TripleO::Services::HAproxy: ../../deployment/haproxy/haproxy-pacemaker-puppet.yaml
   OS::TripleO::Services::Pacemaker: ../../puppet/services/pacemaker.yaml
   OS::TripleO::Services::PacemakerRemote: ../../puppet/services/pacemaker_remote.yaml

ci/environments/scenario012-multinode-containers.yaml

@@ -6,8 +6,8 @@ resource_registry:
   OS::TripleO::Services::IronicConductor: ../../deployment/ironic/ironic-conductor-container-puppet.yaml
   OS::TripleO::Services::IronicPxe: ../../deployment/ironic/ironic-pxe-container-puppet.yaml
   # These enable Pacemaker
-  OS::TripleO::Services::OsloMessagingRpc: ../../docker/services/pacemaker/rpc-rabbitmq.yaml
+  OS::TripleO::Services::OsloMessagingRpc: ../../deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
-  OS::TripleO::Services::OsloMessagingNotify: ../../docker/services/messaging/notify-rabbitmq-shared.yaml
+  OS::TripleO::Services::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml
   OS::TripleO::Services::HAproxy: ../../deployment/haproxy/haproxy-pacemaker-puppet.yaml
   OS::TripleO::Services::Pacemaker: ../../puppet/services/pacemaker.yaml
   OS::TripleO::Services::PacemakerRemote: ../../puppet/services/pacemaker_remote.yaml

deployment/rabbitmq/rabbitmq-container-puppet.yaml

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

deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml

@@ -72,10 +72,10 @@ conditions:
 resources:
 
   ContainersCommon:
-    type: ../containers-common.yaml
+    type: ../../docker/services/containers-common.yaml
 
   RabbitMQServiceBase:
-    type: ../rabbitmq.yaml
+    type: ./rabbitmq-container-puppet.yaml
     properties:
       ServiceData: {get_param: ServiceData}
       ServiceNetMap: {get_param: ServiceNetMap}

deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml

@@ -68,10 +68,10 @@ conditions:
 resources:
 
   ContainersCommon:
-    type: ../containers-common.yaml
+    type: ../../docker/services/containers-common.yaml
 
   RabbitmqBase:
-    type: ../messaging/notify-rabbitmq.yaml
+    type: ./rabbitmq-messaging-notify-container-puppet.yaml
     properties:
       EndpointMap: {get_param: EndpointMap}
       ServiceData: {get_param: ServiceData}

deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml

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

deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml

@@ -68,10 +68,10 @@ conditions:
 resources:
 
   ContainersCommon:
-    type: ../containers-common.yaml
+    type: ../../docker/services/containers-common.yaml
 
   RabbitMQServiceBase:
-    type: ../rabbitmq.yaml
+    type: ./rabbitmq-container-puppet.yaml
     properties:
       ServiceData: {get_param: ServiceData}
       ServiceNetMap: {get_param: ServiceNetMap}
@@ -89,7 +89,6 @@ outputs:
       config_settings:
         map_merge:
           - get_attr: [RabbitMQServiceBase, role_data, config_settings]
-          - rabbitmq::service_manage: false
           - rabbitmq::service_manage: false
             tripleo::profile::pacemaker::rabbitmq_bundle::rabbitmq_docker_image: &rabbitmq_image_pcmklatest
               list_join:

deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml

@@ -73,10 +73,10 @@ conditions:
 resources:
 
   ContainersCommon:
-    type: ../containers-common.yaml
+    type: ../../docker/services/containers-common.yaml
 
   RabbitMQServiceBase:
-    type: ../rabbitmq.yaml
+    type: ./rabbitmq-container-puppet.yaml
     properties:
       ServiceData: {get_param: ServiceData}
       ServiceNetMap: {get_param: ServiceNetMap}

deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml

@@ -68,10 +68,10 @@ conditions:
 resources:
 
   ContainersCommon:
-    type: ../containers-common.yaml
+    type: ../../docker/services/containers-common.yaml
 
   RabbitmqBase:
-    type: ../messaging/rpc-rabbitmq.yaml
+    type: ./rabbitmq-messaging-rpc-container-puppet.yaml
     properties:
       EndpointMap: {get_param: EndpointMap}
       ServiceData: {get_param: ServiceData}

environments/baremetal-services.yaml

@@ -49,7 +49,7 @@ resource_registry:
   OS::TripleO::Services::NovaVncProxy: ../puppet/services/nova-vnc-proxy.yaml
   OS::TripleO::Services::PankoApi: ../deployment/panko/panko-api-container-puppet.yaml
   OS::TripleO::Services::Qdr: OS::Heat::None
-  OS::TripleO::Services::RabbitMQ: ../docker/services/rabbitmq.yaml
+  OS::TripleO::Services::RabbitMQ: ../deployment/rabbitmq/rabbitmq-container-puppet.yaml
   OS::TripleO::Services::Redis: ../puppet/services/database/redis.yaml
   OS::TripleO::Services::Sshd: ../deployment/sshd/sshd-baremetal-puppet.yaml
   OS::TripleO::Services::SwiftDispersion: ../deployment/swift/swift-dispersion-baremetal-puppet.yaml

environments/docker-ha.yaml

@@ -18,6 +18,6 @@ resource_registry:
   OS::TripleO::Services::Clustercheck: ../docker/services/pacemaker/clustercheck.yaml
   OS::TripleO::Services::HAproxy: ../deployment/haproxy/haproxy-pacemaker-puppet.yaml
   OS::TripleO::Services::MySQL: ../docker/services/pacemaker/database/mysql.yaml
-  OS::TripleO::Services::OsloMessagingRpc: ../docker/services/pacemaker/rpc-rabbitmq.yaml
+  OS::TripleO::Services::OsloMessagingRpc: ../deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
-  OS::TripleO::Services::OsloMessagingNotify: ../docker/services/messaging/notify-rabbitmq-shared.yaml
+  OS::TripleO::Services::OsloMessagingNotify: ../deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml
   OS::TripleO::Services::Redis: ../docker/services/pacemaker/database/redis.yaml

environments/docker-uc-light.yaml

@@ -20,8 +20,8 @@ resource_registry:
   OS::TripleO::Services::NeutronCorePlugin: ../docker/services/neutron-plugin-ml2.yaml
   OS::TripleO::Services::NeutronDhcpAgent: ../deployment/neutron/neutron-dhcp-container-puppet.yaml
   OS::TripleO::Services::NeutronServer: ../deployment/neutron/neutron-api-container-puppet.yaml
-  OS::TripleO::Services::OsloMessagingRpc: ../docker/services/messaging/rpc-rabbitmq.yaml
+  OS::TripleO::Services::OsloMessagingRpc: ../deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml
-  OS::TripleO::Services::OsloMessagingNotify: ../docker/services/messaging/notify-rabbitmq-shared.yaml
+  OS::TripleO::Services::OsloMessagingNotify: ../deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml
   OS::TripleO::Services::SwiftProxy: ../deployment/swift/swift-proxy-container-puppet.yaml
   OS::TripleO::Services::SwiftRingBuilder: ../deployment/swift/swift-ringbuilder-container-puppet.yaml
   OS::TripleO::Services::SwiftStorage: ../deployment/swift/swift-storage-container-puppet.yaml

environments/messaging/rpc-qdrouterd-notify-rabbitmq-hybrid.yaml

@@ -18,5 +18,5 @@ parameter_defaults:
   RpcPort: 31459
 
 resource_registry:
-  OS::TripleO::Services::OsloMessagingNotify: ../../docker/services/messaging/notify-rabbitmq.yaml
+  OS::TripleO::Services::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml
   OS::TripleO::Services::OsloMessagingRpc: ../../docker/services/messaging/rpc-qdrouterd.yaml

environments/messaging/rpc-rabbitmq-notify-rabbitmq-shared.yaml

@@ -14,5 +14,5 @@ parameter_defaults:
   RpcPort: 5672
 
 resource_registry:
-  OS::TripleO::Services::OsloMessagingNotify: ../../docker/services/messaging/notify-rabbitmq-shared.yaml
+  OS::TripleO::Services::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml
-  OS::TripleO::Services::OsloMessagingRpc: ../../docker/services/messaging/rpc-rabbitmq.yaml
+  OS::TripleO::Services::OsloMessagingRpc: ../../deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml

environments/nonha-arch.yaml

@@ -2,7 +2,7 @@
 # (i.e. only with keepalived and systemd for all resources)
 resource_registry:
   OS::TripleO::Services::CinderVolume: ../deployment/cinder/cinder-volume-container-puppet.yaml
-  OS::TripleO::Services::RabbitMQ: ../docker/services/rabbitmq.yaml
+  OS::TripleO::Services::RabbitMQ: ../deployment/rabbitmq/rabbitmq-container-puppet.yaml
   OS::TripleO::Services::HAproxy: ../deployment/haproxy/haproxy-container-puppet.yaml
   OS::TripleO::Services::Redis: ../docker/services/database/redis.yaml
   OS::TripleO::Services::MySQL: ../docker/services/database/mysql.yaml

overcloud-resource-registry-puppet.j2.yaml

@@ -173,8 +173,8 @@ resource_registry:
   OS::TripleO::Services::PacemakerRemote: OS::Heat::None
   OS::TripleO::Services::NeutronSriovAgent: OS::Heat::None
   OS::TripleO::Services::NeutronSriovHostConfig: OS::Heat::None
-  OS::TripleO::Services::OsloMessagingRpc: docker/services/messaging/rpc-rabbitmq.yaml
+  OS::TripleO::Services::OsloMessagingRpc: deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml
-  OS::TripleO::Services::OsloMessagingNotify: docker/services/messaging/notify-rabbitmq-shared.yaml
+  OS::TripleO::Services::OsloMessagingNotify: deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml
   OS::TripleO::Services::RabbitMQ: OS::Heat::None
   OS::TripleO::Services::Qdr: OS::Heat::None
   OS::TripleO::Services::HAproxy: deployment/haproxy/haproxy-container-puppet.yaml

sample-env-generator/messaging.yaml

@@ -3,14 +3,14 @@ environments:
     name: messaging/rpc-rabbitmq-notify-rabbitmq-shared
     title: Share single rabbitmq backend for rpc and notify messaging backend
     files:
-      docker/services/messaging/rpc-rabbitmq.yaml:
+      deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml:
         parameters:
           - RpcPort
     sample_value:
       RpcPort: 5672
     resource_registry:
-      OS::TripleO::Services::OsloMessagingRpc: ../../docker/services/messaging/rpc-rabbitmq.yaml
+      OS::TripleO::Services::OsloMessagingRpc: ../../deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml
-      OS::TripleO::Services::OsloMessagingNotify: ../../docker/services/messaging/notify-rabbitmq-shared.yaml
+      OS::TripleO::Services::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml
     description: |
       Include this environment to enable a shared rabbitmq backend for
       oslo.messaging rpc and notification services
@@ -21,7 +21,7 @@ environments:
       puppet/services/messaging/rpc-qdrouterd.yaml:
         parameters:
           - RpcPort
-      docker/services/messaging/notify-rabbitmq.yaml:
+      deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml:
         parameters:
           - NotifyPort
     sample_values:
@@ -29,7 +29,7 @@ environments:
       NotifyPort: 5672
     resource_registry:
       OS::TripleO::Services::OsloMessagingRpc: ../../docker/services/messaging/rpc-qdrouterd.yaml
-      OS::TripleO::Services::OsloMessagingNotify: ../../docker/services/messaging/notify-rabbitmq.yaml
+      OS::TripleO::Services::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml
     description: |
       Include this environment to enable hybrid messaging backends for
       oslo.messaging rpc and notification services

sample-env-generator/ssl.yaml

@@ -37,7 +37,7 @@ environments:
       puppet/services/nova-base.yaml:
         parameters:
           - RpcUseSSL
-      docker/services/messaging/notify-rabbitmq.yaml:
+      deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml:
         parameters:
           - NotifyUseSSL
       overcloud.yaml:

tools/yaml-validate.py

@@ -224,14 +224,15 @@ PREFERRED_CAMEL_CASE = {
 # If a filename is not found in the overrides then the top level directory is
 # used to determine which validation method to use.
 VALIDATE_PUPPET_OVERRIDE = {
+  # deployment/rabbitmq/rabbitmq-messaging*.yaml provide oslo_messaging services
+  './deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml': False,
+  './deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml': False,
+  './deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml': False,
   # docker/services/messaging/*.yaml provide oslo_messaging services
-  './docker/services/messaging/notify-rabbitmq-shared.yaml': False,
-  './docker/services/messaging/notify-rabbitmq.yaml': False,
-  './docker/services/messaging/rpc-rabbitmq.yaml': False,
   './docker/services/messaging/rpc-qdrouterd.yaml': False,
   # docker/services/pacemaker/*-rabbitmq.yaml provide oslo_messaging services
-  './docker/services/pacemaker/notify-rabbitmq.yaml': False,
+  './deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml': False,
-  './docker/services/pacemaker/rpc-rabbitmq.yaml': False,
+  './deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml': False,
   # qdr aliases rabbitmq service to provide alternative messaging backend
   './puppet/services/qdr.yaml': False,
   # puppet/services/messaging/*.yaml provide oslo_messaging services
@@ -239,9 +240,9 @@ VALIDATE_PUPPET_OVERRIDE = {
 
 }
 VALIDATE_DOCKER_OVERRIDE = {
-  # docker/services/messaging/notify-rabbitmq-shared.yaml does not
+  # deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml does not
   # deploy container
-  './docker/services/messaging/notify-rabbitmq-shared.yaml': False,
+  './deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml': False,
 }
 DEPLOYMENT_RESOURCE_TYPES = [
     'OS::Heat::SoftwareDeploymentGroup',