diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-09-27 20:54:34 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-09-27 20:54:34 +0000 |
| commit | f808c7e114e27cbaf083c7acb6ba930272f8591e (patch) | |
| tree | e76cad6c7c4aca3cfb7e8608927f957d76ceaab8 /ci/environments/multinode-containers.yaml | |
| parent | 18edc60b2effe2d0d5ebb8d74a206085708934a4 (diff) | |
| parent | 682686e66b379ab5a04b5cc0752048fb6d2e5100 (diff) | |
Merge "Stop mapping docker to OS::Heat::None in scenarios" into stable/pike
Diffstat (limited to 'ci/environments/multinode-containers.yaml')
| -rw-r--r-- | ci/environments/multinode-containers.yaml | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/ci/environments/multinode-containers.yaml b/ci/environments/multinode-containers.yaml index f050d9a2..781527f4 100644 --- a/ci/environments/multinode-containers.yaml +++ b/ci/environments/multinode-containers.yaml @@ -7,12 +7,6 @@ resource_registry: OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode-os-net-config.yaml OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode-os-net-config.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 - # mapping at all. After we stop CI'ing Ocata->Pike upgrade, we can - # remove this. - OS::TripleO::Services::Docker: OS::Heat::None # Some infra instances don't pass the ping test but are otherwise working. # Since the OVB jobs also test this functionality we can shut it off here. OS::TripleO::AllNodes::Validation: ../common/all-nodes-validation-disabled.yaml |