X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Fenvironments%2Fmultinode_major_upgrade.yaml;h=6710fef72f54cd8895139e6cb8bb864946412246;hb=9916c44b6b03f620d94fdd386b58fc0ec9a0df7d;hp=7de1594ff54ddfa4ca7a8fea08cde5dba2a46bde;hpb=61fd803c9a820a335c0e15c73dba19f49270a790;p=apex-tripleo-heat-templates.git

diff --git a/ci/environments/multinode_major_upgrade.yaml b/ci/environments/multinode_major_upgrade.yaml
index 7de1594f..6710fef7 100644
--- a/ci/environments/multinode_major_upgrade.yaml
+++ b/ci/environments/multinode_major_upgrade.yaml
@@ -1,12 +1,10 @@
 resource_registry:
-  OS::TripleO::Controller::Net::SoftwareConfig: ../heat-templates/net-config-multinode.yaml
-  OS::TripleO::Compute::Net::SoftwareConfig: ../heat-templates/net-config-multinode.yaml
-  OS::TripleO::Services::Core: multinode-core.yaml
+  OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode.yaml
+  OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml
 
 parameter_defaults:
   ControllerServices:
     - OS::TripleO::Services::CACerts
-    - OS::TripleO::Services::Core
     - OS::TripleO::Services::Kernel
     - OS::TripleO::Services::Keystone
     - OS::TripleO::Services::GlanceApi
@@ -30,6 +28,7 @@ parameter_defaults:
     - OS::TripleO::Services::SaharaApi
     - OS::TripleO::Services::SaharaEngine
     - OS::TripleO::Services::MySQL
+    - OS::TripleO::Services::MySQLClient
     - OS::TripleO::Services::RabbitMQ
     - OS::TripleO::Services::HAproxy
     - OS::TripleO::Services::Keepalived
@@ -43,4 +42,6 @@ parameter_defaults:
     nova::compute::libvirt::libvirt_virt_type: qemu
     # Required for Centos 7.3 and Qemu 2.6.0
     nova::compute::libvirt::libvirt_cpu_mode: 'none'
+    heat::rpc_response_timeout: 600
   SwiftCeilometerPipelineEnabled: False
+  Debug: True