openstack/tripleo-heat-templates
Code Issues Proposed changes

Deprecate EC2 API

Browse Source 
The OpenStack EC2 API project isn't maintained upstream, therefore
we deprecate it.

Change-Id: Ieb108a363cecafe3407d0dd505947c99bb24226c
This commit is contained in:
Martin Schuppert 2019-09-20 10:35:16 +02:00
parent 41dcc097ba
commit e3fd3081ca
6 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ci/environments/scenario002-multinode-containers.yaml
View File

@ -3,7 +3,7 @@ resource_registry:
OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml
OS::TripleO::Services::BarbicanApi: ../../deployment/barbican/barbican-api-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/zaqar/zaqar-container-puppet.yaml
OS::TripleO::Services::Ec2Api: ../../deployment/ec2/ec2-api-container-puppet.yaml OS::TripleO::Services::Ec2Api: ../../deployment/deprecated/ec2/ec2-api-container-puppet.yaml
OS::TripleO::Services::OsloMessagingRpc: ../../deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-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::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml
OS::TripleO::Services::Redis: ../../deployment/database/redis-pacemaker-puppet.yaml OS::TripleO::Services::Redis: ../../deployment/database/redis-pacemaker-puppet.yaml

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

@ -15,7 +15,7 @@ resource_registry:
OS::TripleO::Services::HeatEngine: ../../deployment/heat/heat-engine-container-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::BarbicanApi: ../../deployment/barbican/barbican-api-container-puppet.yaml
OS::TripleO::Services::Zaqar: ../../deployment/zaqar/zaqar-container-puppet.yaml OS::TripleO::Services::Zaqar: ../../deployment/zaqar/zaqar-container-puppet.yaml
OS::TripleO::Services::Ec2Api: ../../deployment/ec2/ec2-api-container-puppet.yaml OS::TripleO::Services::Ec2Api: ../../deployment/deprecated/ec2/ec2-api-container-puppet.yaml
OS::TripleO::Services::OsloMessagingRpc: ../../deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml OS::TripleO::Services::OsloMessagingRpc: ../../deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml
OS::TripleO::Services::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml OS::TripleO::Services::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml
OS::TripleO::Services::Redis: ../../deployment/database/redis-container-puppet.yaml OS::TripleO::Services::Redis: ../../deployment/database/redis-container-puppet.yaml

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

@ -89,10 +89,10 @@ conditions:
resources: resources:
ContainersCommon: ContainersCommon:
type: ../containers-common.yaml type: ../../../deployment/containers-common.yaml
MySQLClient: MySQLClient:
type: ../../deployment/database/mysql-client.yaml type: ../../../deployment/database/mysql-client.yaml
TLSProxyBase: TLSProxyBase:

2
environments/services-baremetal/ec2-api.yaml
View File

@ -1,2 +1,2 @@
resource_registry: resource_registry:
OS::TripleO::Services::Ec2Api: ../../deployment/ec2/ec2-api-container-puppet.yaml OS::TripleO::Services::Ec2Api: ../../deployment/deprecated/ec2/ec2-api-container-puppet.yaml

2
environments/services/ec2-api.yaml
View File

@ -1,3 +1,3 @@
# A Heat environment file which can be used to enable EC2-API service. # A Heat environment file which can be used to enable EC2-API service.
resource_registry: resource_registry:
OS::TripleO::Services::Ec2Api: ../../deployment/ec2/ec2-api-container-puppet.yaml OS::TripleO::Services::Ec2Api: ../../deployment/deprecated/ec2/ec2-api-container-puppet.yaml

5
releasenotes/notes/deprecate_ec2_api-811ac17575077b2a.yaml Normal file
View File

@ -0,0 +1,5 @@
---
deprecations:
- |
The OpenStack EC2 API project isn't maintained upstream, therefore
we deprecate it.