From 47ab368caf2566f30dd55138c76ec97fb716370d Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Thu, 8 Oct 2020 13:25:08 -0400 Subject: [PATCH] Deprecate Mistral services Mistral services aren't used anymore on the Undercloud and we never saw users on the Overcloud. For simplification purpose, let's deprecate it so we can reduce our number of containers and services in TripleO. Change-Id: I422766fbdfa5d8728477d2b0d2b1d46a90f631ae --- ci/environments/scenario003-standalone.yaml | 8 ++++---- deployment/{ => deprecated}/mistral/mapping.json | 0 .../mistral/mistral-api-container-puppet.yaml | 4 ++-- deployment/{ => deprecated}/mistral/mistral-base.yaml | 0 .../mistral/mistral-engine-container-puppet.yaml | 4 ++-- .../mistral/mistral-event-engine-container-puppet.yaml | 4 ++-- .../mistral/mistral-executor-container-puppet.yaml | 4 ++-- environments/services-baremetal/mistral.yaml | 9 +++++---- environments/services/mistral.yaml | 9 +++++---- .../notes/deprecate_mistral-9136fd5e41b37e0d.yaml | 4 ++++ 10 files changed, 26 insertions(+), 20 deletions(-) rename deployment/{ => deprecated}/mistral/mapping.json (100%) rename deployment/{ => deprecated}/mistral/mistral-api-container-puppet.yaml (99%) rename deployment/{ => deprecated}/mistral/mistral-base.yaml (100%) rename deployment/{ => deprecated}/mistral/mistral-engine-container-puppet.yaml (98%) rename deployment/{ => deprecated}/mistral/mistral-event-engine-container-puppet.yaml (98%) rename deployment/{ => deprecated}/mistral/mistral-executor-container-puppet.yaml (99%) create mode 100644 releasenotes/notes/deprecate_mistral-9136fd5e41b37e0d.yaml diff --git a/ci/environments/scenario003-standalone.yaml b/ci/environments/scenario003-standalone.yaml index 748ddb8c3d..9954766290 100644 --- a/ci/environments/scenario003-standalone.yaml +++ b/ci/environments/scenario003-standalone.yaml @@ -6,10 +6,10 @@ resource_registry: OS::TripleO::Services::SwiftProxy: OS::Heat::None OS::TripleO::Services::SwiftStorage: OS::Heat::None OS::TripleO::Services::SwiftRingBuilder: OS::Heat::None - OS::TripleO::Services::MistralApi: ../../deployment/mistral/mistral-api-container-puppet.yaml - OS::TripleO::Services::MistralEngine: ../../deployment/mistral/mistral-engine-container-puppet.yaml - 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::MistralApi: ../../deployment/deprecated/mistral/mistral-api-container-puppet.yaml + OS::TripleO::Services::MistralEngine: ../../deployment/deprecated/mistral/mistral-engine-container-puppet.yaml + OS::TripleO::Services::MistralExecutor: ../../deployment/deprecated/mistral/mistral-executor-container-puppet.yaml + OS::TripleO::Services::MistralEventEngine: ../../deployment/deprecated/mistral/mistral-event-engine-container-puppet.yaml OS::TripleO::Services::OsloMessagingRpc: ../../deployment/messaging/rpc-qdrouterd-container-puppet.yaml OS::TripleO::Services::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml OS::TripleO::Services::DesignateApi: ../../deployment/experimental/designate/designate-api-container-puppet.yaml diff --git a/deployment/mistral/mapping.json b/deployment/deprecated/mistral/mapping.json similarity index 100% rename from deployment/mistral/mapping.json rename to deployment/deprecated/mistral/mapping.json diff --git a/deployment/mistral/mistral-api-container-puppet.yaml b/deployment/deprecated/mistral/mistral-api-container-puppet.yaml similarity index 99% rename from deployment/mistral/mistral-api-container-puppet.yaml rename to deployment/deprecated/mistral/mistral-api-container-puppet.yaml index 52d3955e94..9ed059c04b 100644 --- a/deployment/mistral/mistral-api-container-puppet.yaml +++ b/deployment/deprecated/mistral/mistral-api-container-puppet.yaml @@ -82,10 +82,10 @@ conditions: resources: ContainersCommon: - type: ../containers-common.yaml + type: ../../containers-common.yaml MySQLClient: - type: ../database/mysql-client.yaml + type: ../../database/mysql-client.yaml MistralBase: type: ./mistral-base.yaml diff --git a/deployment/mistral/mistral-base.yaml b/deployment/deprecated/mistral/mistral-base.yaml similarity index 100% rename from deployment/mistral/mistral-base.yaml rename to deployment/deprecated/mistral/mistral-base.yaml diff --git a/deployment/mistral/mistral-engine-container-puppet.yaml b/deployment/deprecated/mistral/mistral-engine-container-puppet.yaml similarity index 98% rename from deployment/mistral/mistral-engine-container-puppet.yaml rename to deployment/deprecated/mistral/mistral-engine-container-puppet.yaml index 83af0bc1f0..de1bb8e7a1 100644 --- a/deployment/mistral/mistral-engine-container-puppet.yaml +++ b/deployment/deprecated/mistral/mistral-engine-container-puppet.yaml @@ -61,10 +61,10 @@ parameters: resources: ContainersCommon: - type: ../containers-common.yaml + type: ../../containers-common.yaml MySQLClient: - type: ../database/mysql-client.yaml + type: ../../database/mysql-client.yaml MistralBase: type: ./mistral-base.yaml diff --git a/deployment/mistral/mistral-event-engine-container-puppet.yaml b/deployment/deprecated/mistral/mistral-event-engine-container-puppet.yaml similarity index 98% rename from deployment/mistral/mistral-event-engine-container-puppet.yaml rename to deployment/deprecated/mistral/mistral-event-engine-container-puppet.yaml index 0f0dd889a6..4aa5295c26 100644 --- a/deployment/mistral/mistral-event-engine-container-puppet.yaml +++ b/deployment/deprecated/mistral/mistral-event-engine-container-puppet.yaml @@ -40,10 +40,10 @@ parameters: resources: ContainersCommon: - type: ../containers-common.yaml + type: ../../containers-common.yaml MySQLClient: - type: ../database/mysql-client.yaml + type: ../../database/mysql-client.yaml MistralBase: type: ./mistral-base.yaml diff --git a/deployment/mistral/mistral-executor-container-puppet.yaml b/deployment/deprecated/mistral/mistral-executor-container-puppet.yaml similarity index 99% rename from deployment/mistral/mistral-executor-container-puppet.yaml rename to deployment/deprecated/mistral/mistral-executor-container-puppet.yaml index 36ccca92a6..c492d1cc61 100644 --- a/deployment/mistral/mistral-executor-container-puppet.yaml +++ b/deployment/deprecated/mistral/mistral-executor-container-puppet.yaml @@ -89,10 +89,10 @@ conditions: resources: ContainersCommon: - type: ../containers-common.yaml + type: ../../containers-common.yaml MySQLClient: - type: ../database/mysql-client.yaml + type: ../../database/mysql-client.yaml MistralBase: type: ./mistral-base.yaml diff --git a/environments/services-baremetal/mistral.yaml b/environments/services-baremetal/mistral.yaml index d0086354c6..fddad5fe62 100644 --- a/environments/services-baremetal/mistral.yaml +++ b/environments/services-baremetal/mistral.yaml @@ -1,5 +1,6 @@ +# This environment is deprecated since Mistral will be removed in the future. resource_registry: - OS::TripleO::Services::MistralEngine: ../../deployment/mistral/mistral-engine-container-puppet.yaml - OS::TripleO::Services::MistralApi: ../../deployment/mistral/mistral-api-container-puppet.yaml - 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::MistralEngine: ../../deployment/deprecated/mistral/mistral-engine-container-puppet.yaml + OS::TripleO::Services::MistralApi: ../../deployment/deprecated/mistral/mistral-api-container-puppet.yaml + OS::TripleO::Services::MistralExecutor: ../../deployment/deprecated/mistral/mistral-executor-container-puppet.yaml + OS::TripleO::Services::MistralEventEngine: ../../deployment/deprecated/mistral/mistral-event-engine-container-puppet.yaml diff --git a/environments/services/mistral.yaml b/environments/services/mistral.yaml index d0086354c6..fddad5fe62 100644 --- a/environments/services/mistral.yaml +++ b/environments/services/mistral.yaml @@ -1,5 +1,6 @@ +# This environment is deprecated since Mistral will be removed in the future. resource_registry: - OS::TripleO::Services::MistralEngine: ../../deployment/mistral/mistral-engine-container-puppet.yaml - OS::TripleO::Services::MistralApi: ../../deployment/mistral/mistral-api-container-puppet.yaml - 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::MistralEngine: ../../deployment/deprecated/mistral/mistral-engine-container-puppet.yaml + OS::TripleO::Services::MistralApi: ../../deployment/deprecated/mistral/mistral-api-container-puppet.yaml + OS::TripleO::Services::MistralExecutor: ../../deployment/deprecated/mistral/mistral-executor-container-puppet.yaml + OS::TripleO::Services::MistralEventEngine: ../../deployment/deprecated/mistral/mistral-event-engine-container-puppet.yaml diff --git a/releasenotes/notes/deprecate_mistral-9136fd5e41b37e0d.yaml b/releasenotes/notes/deprecate_mistral-9136fd5e41b37e0d.yaml new file mode 100644 index 0000000000..3f3240dd13 --- /dev/null +++ b/releasenotes/notes/deprecate_mistral-9136fd5e41b37e0d.yaml @@ -0,0 +1,4 @@ +--- +deprecations: + - | + Mistral services are deprecated and will be removed in a next release.