openstack/tripleo-heat-templates
Code Issues Proposed changes

Rename CongressApi to Congress (docker)

Browse Source 
Before it was Congress, let's stay consistent and stop using CongressApi
in Docker service, because we release.

Change-Id: Id939b3d70e185da4279f3860812fa5dce27d64dd
This commit is contained in:
Emilien Macchi 2017-06-22 16:21:49 -04:00
parent 25caba5ce8
commit 79e437954e
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,7 +13,7 @@ resource_registry:
OS::TripleO::Services::PankoApi: ../../docker/services/panko-api.yaml
OS::TripleO::Services::Collectd: ../../docker/services/collectd.yaml
OS::TripleO::Services::Tacker: ../../docker/services/tacker.yaml
OS::TripleO::Services::Congress: ../../docker/services/congress-api.yaml
OS::TripleO::Services::Congress: ../../docker/services/congress.yaml
# TODO fluentd is being containerized: https://review.openstack.org/#/c/467072/
OS::TripleO::Services::FluentdClient: ../../puppet/services/logging/fluentd-client.yaml
OS::TripleO::Services::SensuClient: ../../docker/services/sensu-client.yaml

10
docker/services/congress-api.yaml → docker/services/congress.yaml
View File

@ -44,7 +44,7 @@ resources:
ContainersCommon:
type: ./containers-common.yaml
CongressApiBase:
CongressBase:
type: ../../puppet/services/congress.yaml
properties:
EndpointMap: {get_param: EndpointMap}
@ -57,13 +57,13 @@ outputs:
role_data:
description: Role data for the Congress API role.
value:
service_name: {get_attr: [CongressApiBase, role_data, service_name]}
service_name: {get_attr: [CongressBase, role_data, service_name]}
config_settings:
map_merge:
- get_attr: [CongressApiBase, role_data, config_settings]
- get_attr: [CongressBase, role_data, config_settings]
step_config: &step_config
get_attr: [CongressApiBase, role_data, step_config]
service_config_settings: {get_attr: [CongressApiBase, role_data, service_config_settings]}
get_attr: [CongressBase, role_data, step_config]
service_config_settings: {get_attr: [CongressBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
puppet_config:
config_volume: congress

2
environments/services-docker/congress.yaml
View File

@ -1,2 +1,2 @@
resource_registry:
OS::TripleO::Services::Congress: ../../docker/services/congress-api.yaml
OS::TripleO::Services::Congress: ../../docker/services/congress.yaml