diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-06-23 17:31:29 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-06-23 17:31:29 +0000 |
| commit | a763d9993cb7957982fed37e8c6cd49406587071 (patch) | |
| tree | cc30bd8aa4d432f7770c9ef7530ecc3a4a8727f7 | |
| parent | ffcc946a6bd2a74d003f20fa0f5330073c2ce4ac (diff) | |
| parent | fc7a6ea39dabedb95cc52dce82abcd8f33345637 (diff) | |
Merge "scenario002: containerize services for CI"
| -rw-r--r-- | ci/environments/scenario002-multinode-containers.yaml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ci/environments/scenario002-multinode-containers.yaml b/ci/environments/scenario002-multinode-containers.yaml index 7191deae..92c834b6 100644 --- a/ci/environments/scenario002-multinode-containers.yaml +++ b/ci/environments/scenario002-multinode-containers.yaml @@ -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 |