Merge "Revert "Fixes heat resource name for Internal API Network"" into stable/pike

[apex-tripleo-heat-templates.git] / ci / environments / scenario003-multinode-containers.yaml

diff --git a/ci/environments/scenario003-multinode-containers.yaml b/ci/environments/scenario003-multinode-containers.yaml
index 107b66b..65fa6a6 100644 (file)
--- a/ci/environments/scenario003-multinode-containers.yaml
+++ b/ci/environments/scenario003-multinode-containers.yaml
@@ -11,12 +11,6 @@ resource_registry:
   OS::TripleO::Services::MistralApi: ../../docker/services/mistral-api.yaml
   OS::TripleO::Services::MistralEngine: ../../docker/services/mistral-engine.yaml
   OS::TripleO::Services::MistralExecutor: ../../docker/services/mistral-executor.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