openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Deprecate zaqar services"

This commit is contained in:
Zuul 2020-11-02 13:54:24 +00:00 committed by Gerrit Code Review
parent a65ef2996a d00943a58a
commit a804bf6cfb
6 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ci/environments/scenario002-standalone.yaml
View File

@ -14,7 +14,7 @@ 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::BarbicanApi: ../../deployment/barbican/barbican-api-container-puppet.yaml
OS::TripleO::Services::Zaqar: ../../deployment/zaqar/zaqar-container-puppet.yaml
OS::TripleO::Services::Zaqar: ../../deployment/deprecated/zaqar/zaqar-container-puppet.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: ../../deployment/database/redis-pacemaker-puppet.yaml

6
deployment/zaqar/zaqar-container-puppet.yaml → deployment/deprecated/zaqar/zaqar-container-puppet.yaml
View File

@ -103,7 +103,7 @@ conditions:
resources:
ApacheServiceBase:
type: ../../deployment/apache/apache-baremetal-puppet.yaml
type: ../../../deployment/apache/apache-baremetal-puppet.yaml
properties:
ServiceData: {get_param: ServiceData}
ServiceNetMap: {get_param: ServiceNetMap}
@ -112,10 +112,10 @@ resources:
EnableInternalTLS: {get_param: EnableInternalTLS}
ContainersCommon:
type: ../containers-common.yaml
type: ../../containers-common.yaml
MySQLClient:
type: ../database/mysql-client.yaml
type: ../../database/mysql-client.yaml
outputs:
role_data:

2
environments/services/zaqar-swift-backend.yaml
View File

@ -1,4 +1,4 @@
# Env file to enable zaqar without makins use of Redis as a backend
resource_registry:
OS::TripleO::Services::Zaqar: ../../deployment/zaqar/zaqar-container-puppet.yaml
OS::TripleO::Services::Zaqar: ../../deployment/deprecated/zaqar/zaqar-container-puppet.yaml
OS::TripleO::Services::Redis: OS::Heat::None

2
environments/services/zaqar.yaml
View File

@ -1,3 +1,3 @@
resource_registry:
OS::TripleO::Services::Zaqar: ../../deployment/zaqar/zaqar-container-puppet.yaml
OS::TripleO::Services::Zaqar: ../../deployment/deprecated/zaqar/zaqar-container-puppet.yaml
OS::TripleO::Services::Redis : ../../deployment/database/redis-container-puppet.yaml

2
environments/undercloud.yaml
View File

@ -134,8 +134,6 @@ parameter_defaults:
# - ip_range: '192.168.24.100,192.168.24.200'
IronicProvisioningNetwork: 'ctlplane'
IronicRescuingNetwork: 'ctlplane'
ZaqarMessageStore: 'swift'
ZaqarManagementStore: 'sqlalchemy'
MistralCorsAllowedOrigin: '*'
MistralExecutionFieldSizeLimit: 16384
NeutronServicePlugins: router,segments

4
releasenotes/notes/deprecate-zaqar-622f409474813783.yaml Normal file
View File

@ -0,0 +1,4 @@
---
deprecations:
- |
Zaqar services are deprecated for removal.