diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-07-07 19:05:08 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-07-07 19:05:08 +0000 |
| commit | e9bc7c13bf6baf104fba3411e360fe5cde65dc3d (patch) | |
| tree | e3e9f11b3019ff1a1079ee6035a587549c61168a | |
| parent | 1b04a0f9a521b575d4438d1ee51dea588ad2f984 (diff) | |
| parent | 79e437954ea802c058aa9baa8d7b0d603a4c2c82 (diff) | |
Merge "Rename CongressApi to Congress (docker)"
| -rw-r--r-- | ci/environments/scenario001-multinode-containers.yaml | 2 | ||||
| -rw-r--r-- | docker/services/congress.yaml (renamed from docker/services/congress-api.yaml) | 10 | ||||
| -rw-r--r-- | environments/services-docker/congress.yaml | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/ci/environments/scenario001-multinode-containers.yaml b/ci/environments/scenario001-multinode-containers.yaml index 7c323811..af96ea86 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 52395d5e..5b5a2190 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 5d4c7307..e1edd352 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 |