From f1d9b15c85fd1ed2250d40cea8184a18f458234f Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Mon, 13 Apr 2020 20:39:28 +0900 Subject: [PATCH] Deprecate Sahara support Change-Id: I20445402dd7397a817566f8fa9ec244a41982351 --- ci/environments/scenario003-standalone.yaml | 4 ++-- .../{ => deprecated}/sahara/sahara-api-container-puppet.yaml | 4 ++-- deployment/{ => deprecated}/sahara/sahara-base.yaml | 0 .../sahara/sahara-engine-container-puppet.yaml | 4 ++-- environments/services/sahara.yaml | 4 ++-- releasenotes/notes/deprecate-sahara-8f0bc905e3d21af2.yaml | 5 +++++ 6 files changed, 13 insertions(+), 8 deletions(-) rename deployment/{ => deprecated}/sahara/sahara-api-container-puppet.yaml (99%) rename deployment/{ => deprecated}/sahara/sahara-base.yaml (100%) rename deployment/{ => deprecated}/sahara/sahara-engine-container-puppet.yaml (98%) create mode 100644 releasenotes/notes/deprecate-sahara-8f0bc905e3d21af2.yaml diff --git a/ci/environments/scenario003-standalone.yaml b/ci/environments/scenario003-standalone.yaml index 5372c58922..bc4fcb0be4 100644 --- a/ci/environments/scenario003-standalone.yaml +++ b/ci/environments/scenario003-standalone.yaml @@ -6,8 +6,8 @@ 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::SaharaApi: ../../deployment/sahara/sahara-api-container-puppet.yaml - OS::TripleO::Services::SaharaEngine: ../../deployment/sahara/sahara-engine-container-puppet.yaml + OS::TripleO::Services::SaharaApi: ../../deployment/deprecated/sahara/sahara-api-container-puppet.yaml + OS::TripleO::Services::SaharaEngine: ../../deployment/deprecated/sahara/sahara-engine-container-puppet.yaml 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 diff --git a/deployment/sahara/sahara-api-container-puppet.yaml b/deployment/deprecated/sahara/sahara-api-container-puppet.yaml similarity index 99% rename from deployment/sahara/sahara-api-container-puppet.yaml rename to deployment/deprecated/sahara/sahara-api-container-puppet.yaml index 6dee8e1b33..4f83ed4a1f 100644 --- a/deployment/sahara/sahara-api-container-puppet.yaml +++ b/deployment/deprecated/sahara/sahara-api-container-puppet.yaml @@ -72,10 +72,10 @@ parameters: resources: ContainersCommon: - type: ../containers-common.yaml + type: ../../containers-common.yaml MySQLClient: - type: ../database/mysql-client.yaml + type: ../../database/mysql-client.yaml SaharaPuppetBase: type: ./sahara-base.yaml diff --git a/deployment/sahara/sahara-base.yaml b/deployment/deprecated/sahara/sahara-base.yaml similarity index 100% rename from deployment/sahara/sahara-base.yaml rename to deployment/deprecated/sahara/sahara-base.yaml diff --git a/deployment/sahara/sahara-engine-container-puppet.yaml b/deployment/deprecated/sahara/sahara-engine-container-puppet.yaml similarity index 98% rename from deployment/sahara/sahara-engine-container-puppet.yaml rename to deployment/deprecated/sahara/sahara-engine-container-puppet.yaml index 156d2d6528..0533c873a5 100644 --- a/deployment/sahara/sahara-engine-container-puppet.yaml +++ b/deployment/deprecated/sahara/sahara-engine-container-puppet.yaml @@ -48,10 +48,10 @@ parameters: resources: ContainersCommon: - type: ../containers-common.yaml + type: ../../containers-common.yaml MySQLClient: - type: ../database/mysql-client.yaml + type: ../../database/mysql-client.yaml SaharaBase: type: ./sahara-base.yaml diff --git a/environments/services/sahara.yaml b/environments/services/sahara.yaml index 4d97bf25d2..9437de52ab 100644 --- a/environments/services/sahara.yaml +++ b/environments/services/sahara.yaml @@ -1,3 +1,3 @@ resource_registry: - OS::TripleO::Services::SaharaApi: ../../deployment/sahara/sahara-api-container-puppet.yaml - OS::TripleO::Services::SaharaEngine: ../../deployment/sahara/sahara-engine-container-puppet.yaml + OS::TripleO::Services::SaharaApi: ../../deployment/deprecated/sahara/sahara-api-container-puppet.yaml + OS::TripleO::Services::SaharaEngine: ../../deployment/deprecated/sahara/sahara-engine-container-puppet.yaml diff --git a/releasenotes/notes/deprecate-sahara-8f0bc905e3d21af2.yaml b/releasenotes/notes/deprecate-sahara-8f0bc905e3d21af2.yaml new file mode 100644 index 0000000000..6a40fd7478 --- /dev/null +++ b/releasenotes/notes/deprecate-sahara-8f0bc905e3d21af2.yaml @@ -0,0 +1,5 @@ +--- +deprecations: + - | + Support for Sahara services is now deprecated, and will be removd in + a future release.