Deprecate zaqar services

Already been disabled in undercloud and we don't intend
to support it on overcloud.

Also removes some zaqar specific parameters from undercloud.yaml
environment as it's already disabled.

Change-Id: I564f24e0760d09302cbc9a4be84e470bb31106be
This commit is contained in:
Rabi Mishra 2020-10-29 14:01:45 +05:30
parent f9e860a4d2
commit d00943a58a
6 changed files with 10 additions and 8 deletions

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

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:

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

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

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

View File

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