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

diff --git a/ci/environments/scenario001-multinode-containers.yaml b/ci/environments/scenario001-multinode-containers.yaml
index 7c32381..af96ea8 100644 (file)
--- 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
similarity index 93%
rename from docker/services/congress-api.yaml
rename to docker/services/congress.yaml
index 52395d5..5b5a219 100644 (file)
--- 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 (file)
--- 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