openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Deprecate Sahara support"

Browse Source
This commit is contained in:
Zuul 2020-04-18 07:54:37 +00:00 committed by Gerrit Code Review
commit e5b4d119ed
6 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ci/environments/scenario003-standalone.yaml
View File

@ -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

4
deployment/sahara/sahara-api-container-puppet.yaml → deployment/deprecated/sahara/sahara-api-container-puppet.yaml
View File

@ -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

0
deployment/sahara/sahara-base.yaml → deployment/deprecated/sahara/sahara-base.yaml
View File

4
deployment/sahara/sahara-engine-container-puppet.yaml → deployment/deprecated/sahara/sahara-engine-container-puppet.yaml
View File

@ -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

4
environments/services/sahara.yaml
View File

@ -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

5
releasenotes/notes/deprecate-sahara-8f0bc905e3d21af2.yaml Normal file
View File

@ -0,0 +1,5 @@
---
deprecations:
- |
Support for Sahara services is now deprecated, and will be removd in
a future release.