Merge "scenario002: containerize services for CI"
This commit is contained in:
commit
a763d9993c
@ -6,9 +6,10 @@
|
||||
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::Ec2Api: ../../puppet/services/ec2-api.yaml
|
||||
# TODO: Barbican is not yet containerized: https://review.openstack.org/#/c/474327
|
||||
# OS::TripleO::Services::BarbicanApi: ../../docker/services/barbican-api.yaml
|
||||
OS::TripleO::Services::Zaqar: ../../docker/services/zaqar.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
|
||||
# overcloud-resource-registry.yaml there doesn't have this Docker
|
||||
|
Loading…
x
Reference in New Issue
Block a user