From c9adaaeb2fcae0040a1d76e096d6958af7140583 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Jeanneret?= Date: Wed, 6 Feb 2019 10:06:55 +0100 Subject: [PATCH] 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 | 4 ++-- .../scenario000-multinode-containers.yaml | 4 ++-- .../scenario001-multinode-containers.yaml | 4 ++-- ci/environments/scenario001-standalone.yaml | 4 ++-- .../scenario002-multinode-containers.yaml | 4 ++-- ci/environments/scenario002-standalone.yaml | 4 ++-- .../scenario003-multinode-containers.yaml | 2 +- ci/environments/scenario003-standalone.yaml | 2 +- .../scenario004-multinode-containers.yaml | 4 ++-- ci/environments/scenario004-standalone.yaml | 4 ++-- .../scenario012-multinode-containers.yaml | 4 ++-- .../rabbitmq/rabbitmq-container-puppet.yaml | 2 +- ...abbitmq-messaging-notify-container-puppet.yaml | 4 ++-- ...abbitmq-messaging-notify-pacemaker-puppet.yaml | 4 ++-- .../rabbitmq-messaging-notify-shared-puppet.yaml | 2 +- .../rabbitmq-messaging-pacemaker-puppet.yaml | 5 ++--- .../rabbitmq-messaging-rpc-container-puppet.yaml | 4 ++-- .../rabbitmq-messaging-rpc-pacemaker-puppet.yaml | 4 ++-- environments/baremetal-services.yaml | 2 +- environments/docker-ha.yaml | 4 ++-- environments/docker-uc-light.yaml | 4 ++-- .../rpc-qdrouterd-notify-rabbitmq-hybrid.yaml | 2 +- .../rpc-rabbitmq-notify-rabbitmq-shared.yaml | 4 ++-- environments/nonha-arch.yaml | 2 +- overcloud-resource-registry-puppet.j2.yaml | 4 ++-- sample-env-generator/messaging.yaml | 10 +++++----- sample-env-generator/ssl.yaml | 2 +- tools/yaml-validate.py | 15 ++++++++------- 28 files changed, 57 insertions(+), 57 deletions(-) rename docker/services/rabbitmq.yaml => deployment/rabbitmq/rabbitmq-container-puppet.yaml (99%) rename docker/services/messaging/notify-rabbitmq.yaml => deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml (99%) rename docker/services/pacemaker/notify-rabbitmq.yaml => deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml (99%) rename docker/services/messaging/notify-rabbitmq-shared.yaml => deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml (97%) rename docker/services/pacemaker/rabbitmq.yaml => deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml (99%) rename docker/services/messaging/rpc-rabbitmq.yaml => deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml (99%) rename docker/services/pacemaker/rpc-rabbitmq.yaml => deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml (99%) diff --git a/ci/environments/multinode-3nodes-registry.yaml b/ci/environments/multinode-3nodes-registry.yaml index c5f5c6f1f3..afe0a19c06 100644 --- a/ci/environments/multinode-3nodes-registry.yaml +++ b/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::OsloMessagingNotify: ../../docker/services/messaging/notify-rabbitmq-shared.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::HAproxy: ../../deployment/haproxy/haproxy-pacemaker-puppet.yaml OS::TripleO::Services::Pacemaker: ../../puppet/services/pacemaker.yaml OS::TripleO::Services::PacemakerRemote: ../../puppet/services/pacemaker_remote.yaml diff --git a/ci/environments/scenario000-multinode-containers.yaml b/ci/environments/scenario000-multinode-containers.yaml index 93d4f25774..0bd53b32b3 100644 --- a/ci/environments/scenario000-multinode-containers.yaml +++ b/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::OsloMessagingNotify: ../../docker/services/messaging/notify-rabbitmq-shared.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::HAproxy: ../../deployment/haproxy/haproxy-pacemaker-puppet.yaml OS::TripleO::Services::Pacemaker: ../../puppet/services/pacemaker.yaml OS::TripleO::Services::PacemakerRemote: ../../puppet/services/pacemaker_remote.yaml diff --git a/ci/environments/scenario001-multinode-containers.yaml b/ci/environments/scenario001-multinode-containers.yaml index 4088084106..62596987c4 100644 --- a/ci/environments/scenario001-multinode-containers.yaml +++ b/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::OsloMessagingNotify: ../../docker/services/messaging/notify-rabbitmq-shared.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::HAproxy: ../../deployment/haproxy/haproxy-pacemaker-puppet.yaml OS::TripleO::Services::Pacemaker: ../../puppet/services/pacemaker.yaml OS::TripleO::Services::PacemakerRemote: ../../puppet/services/pacemaker_remote.yaml diff --git a/ci/environments/scenario001-standalone.yaml b/ci/environments/scenario001-standalone.yaml index 83aa8dff98..a284472a49 100644 --- a/ci/environments/scenario001-standalone.yaml +++ b/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::OsloMessagingNotify: ../../docker/services/messaging/notify-rabbitmq-shared.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::HAproxy: ../../deployment/haproxy/haproxy-pacemaker-puppet.yaml OS::TripleO::Services::Pacemaker: ../../puppet/services/pacemaker.yaml OS::TripleO::Services::PacemakerRemote: ../../puppet/services/pacemaker_remote.yaml diff --git a/ci/environments/scenario002-multinode-containers.yaml b/ci/environments/scenario002-multinode-containers.yaml index 08fcc0909f..f365958a57 100644 --- a/ci/environments/scenario002-multinode-containers.yaml +++ b/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::OsloMessagingNotify: ../../docker/services/messaging/notify-rabbitmq-shared.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 OS::TripleO::Services::HAproxy: ../../deployment/haproxy/haproxy-pacemaker-puppet.yaml OS::TripleO::Services::Pacemaker: ../../puppet/services/pacemaker.yaml diff --git a/ci/environments/scenario002-standalone.yaml b/ci/environments/scenario002-standalone.yaml index 5c2e89443f..3324fd9a3f 100644 --- a/ci/environments/scenario002-standalone.yaml +++ b/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::OsloMessagingNotify: ../../docker/services/messaging/notify-rabbitmq-shared.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 OS::TripleO::Services::HAproxy: ../../deployment/haproxy/haproxy-pacemaker-puppet.yaml OS::TripleO::Services::Pacemaker: ../../puppet/services/pacemaker.yaml diff --git a/ci/environments/scenario003-multinode-containers.yaml b/ci/environments/scenario003-multinode-containers.yaml index bee38f7aed..62ba29a0b6 100644 --- a/ci/environments/scenario003-multinode-containers.yaml +++ b/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 diff --git a/ci/environments/scenario003-standalone.yaml b/ci/environments/scenario003-standalone.yaml index 474ce2474e..9925e232aa 100644 --- a/ci/environments/scenario003-standalone.yaml +++ b/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 diff --git a/ci/environments/scenario004-multinode-containers.yaml b/ci/environments/scenario004-multinode-containers.yaml index d38b5afa49..c4a6d92a33 100644 --- a/ci/environments/scenario004-multinode-containers.yaml +++ b/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::OsloMessagingNotify: ../../docker/services/messaging/notify-rabbitmq-shared.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::HAproxy: ../../deployment/haproxy/haproxy-pacemaker-puppet.yaml OS::TripleO::Services::Pacemaker: ../../puppet/services/pacemaker.yaml OS::TripleO::Services::PacemakerRemote: ../../puppet/services/pacemaker_remote.yaml diff --git a/ci/environments/scenario004-standalone.yaml b/ci/environments/scenario004-standalone.yaml index 8abab45324..9f87a9e792 100644 --- a/ci/environments/scenario004-standalone.yaml +++ b/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::OsloMessagingNotify: ../../docker/services/messaging/notify-rabbitmq-shared.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::HAproxy: ../../deployment/haproxy/haproxy-pacemaker-puppet.yaml OS::TripleO::Services::Pacemaker: ../../puppet/services/pacemaker.yaml OS::TripleO::Services::PacemakerRemote: ../../puppet/services/pacemaker_remote.yaml diff --git a/ci/environments/scenario012-multinode-containers.yaml b/ci/environments/scenario012-multinode-containers.yaml index d635e36431..3daffe94df 100644 --- a/ci/environments/scenario012-multinode-containers.yaml +++ b/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::OsloMessagingNotify: ../../docker/services/messaging/notify-rabbitmq-shared.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::HAproxy: ../../deployment/haproxy/haproxy-pacemaker-puppet.yaml OS::TripleO::Services::Pacemaker: ../../puppet/services/pacemaker.yaml OS::TripleO::Services::PacemakerRemote: ../../puppet/services/pacemaker_remote.yaml diff --git a/docker/services/rabbitmq.yaml b/deployment/rabbitmq/rabbitmq-container-puppet.yaml similarity index 99% rename from docker/services/rabbitmq.yaml rename to deployment/rabbitmq/rabbitmq-container-puppet.yaml index e40f6a9080..13628c12da 100644 --- a/docker/services/rabbitmq.yaml +++ b/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: diff --git a/docker/services/messaging/notify-rabbitmq.yaml b/deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml similarity index 99% rename from docker/services/messaging/notify-rabbitmq.yaml rename to deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml index 26293e6b9f..0c2e0cf849 100644 --- a/docker/services/messaging/notify-rabbitmq.yaml +++ b/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} diff --git a/docker/services/pacemaker/notify-rabbitmq.yaml b/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml similarity index 99% rename from docker/services/pacemaker/notify-rabbitmq.yaml rename to deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml index 1ac12e2290..0664796339 100644 --- a/docker/services/pacemaker/notify-rabbitmq.yaml +++ b/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} diff --git a/docker/services/messaging/notify-rabbitmq-shared.yaml b/deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml similarity index 97% rename from docker/services/messaging/notify-rabbitmq-shared.yaml rename to deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml index 4262459ead..532a2cf963 100644 --- a/docker/services/messaging/notify-rabbitmq-shared.yaml +++ b/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: diff --git a/docker/services/pacemaker/rabbitmq.yaml b/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml similarity index 99% rename from docker/services/pacemaker/rabbitmq.yaml rename to deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml index b3cf1dc1e0..4c109f87b8 100644 --- a/docker/services/pacemaker/rabbitmq.yaml +++ b/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: diff --git a/docker/services/messaging/rpc-rabbitmq.yaml b/deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml similarity index 99% rename from docker/services/messaging/rpc-rabbitmq.yaml rename to deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml index 0e3f492da9..dd76e7a8ff 100644 --- a/docker/services/messaging/rpc-rabbitmq.yaml +++ b/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} diff --git a/docker/services/pacemaker/rpc-rabbitmq.yaml b/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml similarity index 99% rename from docker/services/pacemaker/rpc-rabbitmq.yaml rename to deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml index bf50f42331..4e1f42d0af 100644 --- a/docker/services/pacemaker/rpc-rabbitmq.yaml +++ b/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} diff --git a/environments/baremetal-services.yaml b/environments/baremetal-services.yaml index b5c8d862f8..76ccbf3eed 100644 --- a/environments/baremetal-services.yaml +++ b/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 diff --git a/environments/docker-ha.yaml b/environments/docker-ha.yaml index c1a4a23d5b..b5460170f6 100644 --- a/environments/docker-ha.yaml +++ b/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::OsloMessagingNotify: ../docker/services/messaging/notify-rabbitmq-shared.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 diff --git a/environments/docker-uc-light.yaml b/environments/docker-uc-light.yaml index 42cd5734f0..e3891b37fc 100644 --- a/environments/docker-uc-light.yaml +++ b/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::OsloMessagingNotify: ../docker/services/messaging/notify-rabbitmq-shared.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::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 diff --git a/environments/messaging/rpc-qdrouterd-notify-rabbitmq-hybrid.yaml b/environments/messaging/rpc-qdrouterd-notify-rabbitmq-hybrid.yaml index 3215c33611..21cfc88524 100644 --- a/environments/messaging/rpc-qdrouterd-notify-rabbitmq-hybrid.yaml +++ b/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 diff --git a/environments/messaging/rpc-rabbitmq-notify-rabbitmq-shared.yaml b/environments/messaging/rpc-rabbitmq-notify-rabbitmq-shared.yaml index 46e718a1f9..75e4931b72 100644 --- a/environments/messaging/rpc-rabbitmq-notify-rabbitmq-shared.yaml +++ b/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::OsloMessagingRpc: ../../docker/services/messaging/rpc-rabbitmq.yaml + OS::TripleO::Services::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml + OS::TripleO::Services::OsloMessagingRpc: ../../deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml diff --git a/environments/nonha-arch.yaml b/environments/nonha-arch.yaml index 1568274eb8..1c861d65c6 100644 --- a/environments/nonha-arch.yaml +++ b/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 diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index 4db561fa80..78beaf4a80 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/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::OsloMessagingNotify: docker/services/messaging/notify-rabbitmq-shared.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::RabbitMQ: OS::Heat::None OS::TripleO::Services::Qdr: OS::Heat::None OS::TripleO::Services::HAproxy: deployment/haproxy/haproxy-container-puppet.yaml diff --git a/sample-env-generator/messaging.yaml b/sample-env-generator/messaging.yaml index dcdd405909..aa899e9f51 100644 --- a/sample-env-generator/messaging.yaml +++ b/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::OsloMessagingNotify: ../../docker/services/messaging/notify-rabbitmq-shared.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 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 diff --git a/sample-env-generator/ssl.yaml b/sample-env-generator/ssl.yaml index 4f54d56f97..6ab5c072e5 100644 --- a/sample-env-generator/ssl.yaml +++ b/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: diff --git a/tools/yaml-validate.py b/tools/yaml-validate.py index 9dee5f2bdd..b7e1461a69 100755 --- a/tools/yaml-validate.py +++ b/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, - './docker/services/pacemaker/rpc-rabbitmq.yaml': False, + './deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.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',