aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmilien Macchi <emilien@redhat.com>2017-06-22 16:21:49 -0400
committerEmilien Macchi <emilien@redhat.com>2017-07-07 14:13:07 +0000
commit79e437954ea802c058aa9baa8d7b0d603a4c2c82 (patch)
tree3dc9fba42b7708a5adf61e1f0c257ded6926a338
parent25caba5ce844c722e590333be87a0a7346f02a35 (diff)
Rename CongressApi to Congress (docker)
Before it was Congress, let's stay consistent and stop using CongressApi in Docker service, because we release. Change-Id: Id939b3d70e185da4279f3860812fa5dce27d64dd
-rw-r--r--ci/environments/scenario001-multinode-containers.yaml2
-rw-r--r--docker/services/congress.yaml (renamed from docker/services/congress-api.yaml)10
-rw-r--r--environments/services-docker/congress.yaml2
3 files changed, 7 insertions, 7 deletions
diff --git a/ci/environments/scenario001-multinode-containers.yaml b/ci/environments/scenario001-multinode-containers.yaml
index 7c32381..af96ea8 100644
--- a/ci/environments/scenario001-multinode-containers.yaml
+++ b/ci/environments/scenario001-multinode-containers.yaml
@@ -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
diff --git a/docker/services/congress-api.yaml b/docker/services/congress.yaml
index 52395d5..5b5a219 100644
--- a/docker/services/congress-api.yaml
+++ b/docker/services/congress.yaml
@@ -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
diff --git a/environments/services-docker/congress.yaml b/environments/services-docker/congress.yaml
index 5d4c730..e1edd35 100644
--- a/environments/services-docker/congress.yaml
+++ b/environments/services-docker/congress.yaml
@@ -1,2 +1,2 @@
resource_registry:
- OS::TripleO::Services::Congress: ../../docker/services/congress-api.yaml
+ OS::TripleO::Services::Congress: ../../docker/services/congress.yaml