openstack/tripleo-heat-templates
Code Issues Proposed changes

Zaqar: Match service name with service-net-map

Browse Source 
This is required for t-h-t to generate the appropriate hieradata.

Change-Id: I9b451eac4427a52ad8eec62ff89acc6c6d3ab799
Closes-Bug: #1712328
This commit is contained in:
Juan Antonio Osorio Robles 2017-08-22 12:06:30 +00:00
parent 1d1ad7849b
commit 8cb4da7a1e
6 changed files with 12 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

@ -11,7 +11,7 @@ resource_registry:
OS::TripleO::Services::BarbicanApi: ../../puppet/services/barbican-api.yaml OS::TripleO::Services::BarbicanApi: ../../puppet/services/barbican-api.yaml
# TODO: Zaqar doesn't work when containerized # TODO: Zaqar doesn't work when containerized
# https://bugs.launchpad.net/tripleo/+bug/1710959 # https://bugs.launchpad.net/tripleo/+bug/1710959
OS::TripleO::Services::Zaqar: ../../puppet/services/zaqar.yaml OS::TripleO::Services::Zaqar: ../../puppet/services/zaqar-api.yaml
OS::TripleO::Services::Ec2Api: ../../docker/services/ec2-api.yaml OS::TripleO::Services::Ec2Api: ../../docker/services/ec2-api.yaml
# NOTE: This is needed because of upgrades from Ocata to Pike. We # NOTE: This is needed because of upgrades from Ocata to Pike. We
# deploy the initial environment with Ocata templates, and # deploy the initial environment with Ocata templates, and

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

@ -2,7 +2,7 @@ resource_registry:
OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode.yaml OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode.yaml
OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml
OS::TripleO::Services::BarbicanApi: ../../puppet/services/barbican-api.yaml OS::TripleO::Services::BarbicanApi: ../../puppet/services/barbican-api.yaml
OS::TripleO::Services::Zaqar: ../../puppet/services/zaqar.yaml OS::TripleO::Services::Zaqar: ../../puppet/services/zaqar-api.yaml
OS::TripleO::Services::Ec2Api: ../../puppet/services/ec2-api.yaml OS::TripleO::Services::Ec2Api: ../../puppet/services/ec2-api.yaml
OS::TripleO::Services::RabbitMQ: ../../puppet/services/pacemaker/rabbitmq.yaml OS::TripleO::Services::RabbitMQ: ../../puppet/services/pacemaker/rabbitmq.yaml
OS::TripleO::Services::Redis: ../../puppet/services/pacemaker/database/redis.yaml OS::TripleO::Services::Redis: ../../puppet/services/pacemaker/database/redis.yaml

2
docker/services/zaqar.yaml
View File

@ -57,7 +57,7 @@ resources:
type: ../../puppet/services/database/mysql-client.yaml type: ../../puppet/services/database/mysql-client.yaml
ZaqarBase: ZaqarBase:
type: ../../puppet/services/zaqar.yaml type: ../../puppet/services/zaqar-api.yaml
properties: properties:
EndpointMap: {get_param: EndpointMap} EndpointMap: {get_param: EndpointMap}
ServiceData: {get_param: ServiceData} ServiceData: {get_param: ServiceData}

2
environments/services/zaqar.yaml
View File

@ -1,3 +1,3 @@
resource_registry: resource_registry:
OS::TripleO::Services::Zaqar: ../../puppet/services/zaqar.yaml OS::TripleO::Services::Zaqar: ../../puppet/services/zaqar-api.yaml
OS::TripleO::Services::MongoDb: ../../puppet/services/database/mongodb.yaml OS::TripleO::Services::MongoDb: ../../puppet/services/database/mongodb.yaml

4
puppet/services/zaqar.yaml → puppet/services/zaqar-api.yaml
View File

@ -87,9 +87,9 @@ resources:
outputs: outputs:
role_data: role_data:
description: Shared role data for the Heat services. description: Shared role data for the Zaqar services.
value: value:
service_name: zaqar service_name: zaqar_api
config_settings: config_settings:
map_merge: map_merge:
- get_attr: [ApacheServiceBase, role_data, config_settings] - get_attr: [ApacheServiceBase, role_data, config_settings]

6
releasenotes/notes/Change-zaqar-profile-path-7b00c68c0812fb3d.yaml Normal file
View File

@ -0,0 +1,6 @@
---
upgrade:
- |
The path to the zaqar profile has changed from puppet/services/zaqar.yaml to
puppet/services/zaqar-api.yaml. Make sure to update any references to this
in the resource registry.