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 8e1b3a0..65fa6a6 100644 (file)
--- a/ci/environments/scenario003-multinode-containers.yaml
+++ b/ci/environments/scenario003-multinode-containers.yaml
@@ -11,18 +11,14 @@ 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
+  OS::TripleO::Services::NovaMigrationTarget: OS::Heat::None
 
 parameter_defaults:
   ControllerServices:
+    - OS::TripleO::Services::Clustercheck
     - OS::TripleO::Services::Docker
     - OS::TripleO::Services::Kernel
     - OS::TripleO::Services::Keystone
@@ -62,6 +58,7 @@ parameter_defaults:
     - OS::TripleO::Services::TripleoPackages
     - OS::TripleO::Services::TripleoFirewall
     - OS::TripleO::Services::Sshd
+    - OS::TripleO::Services::Iscsid
   ControllerExtraConfig:
     nova::compute::libvirt::services::libvirt_virt_type: qemu
     nova::compute::libvirt::libvirt_virt_type: qemu
@@ -70,3 +67,4 @@ parameter_defaults:
   GlanceBackend: 'file'
   KeystoneTokenProvider: 'fernet'
   SwiftCeilometerPipelineEnabled: false
+  NotificationDriver: 'noop'