Merge "Zaqar: Match service name with service-net-map"

This commit is contained in:
Jenkins 2017-08-22 18:31:51 +00:00 committed by Gerrit Code Review
commit 27652e96a8
6 changed files with 12 additions and 6 deletions

View File

@ -11,7 +11,7 @@ resource_registry:
OS::TripleO::Services::BarbicanApi: ../../puppet/services/barbican-api.yaml
# TODO: Zaqar doesn't work when containerized
# 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
# NOTE: This is needed because of upgrades from Ocata to Pike. We
# deploy the initial environment with Ocata templates, and

View File

@ -2,7 +2,7 @@ resource_registry:
OS::TripleO::Controller::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::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::RabbitMQ: ../../puppet/services/pacemaker/rabbitmq.yaml
OS::TripleO::Services::Redis: ../../puppet/services/pacemaker/database/redis.yaml

View File

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

View File

@ -1,3 +1,3 @@
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

View File

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

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.