From: Jenkins <jenkins@review.openstack.org>
Date: Mon, 24 Jul 2017 15:22:39 +0000 (+0000)
Subject: Merge "Add support for nova live/cold-migration with containers"
X-Git-Tag: opnfv-6.0.0~362
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=86621ff34a9c719cd68d61154a7987d491176038;p=apex-tripleo-heat-templates.git

Merge "Add support for nova live/cold-migration with containers"
---

86621ff34a9c719cd68d61154a7987d491176038
diff --cc ci/environments/multinode-3nodes.yaml
index 72d01ed6,bf68ec9d..e040b015
--- a/ci/environments/multinode-3nodes.yaml
+++ b/ci/environments/multinode-3nodes.yaml
@@@ -55,9 -55,9 +55,10 @@@
      - OS::TripleO::Services::TripleoFirewall
      - OS::TripleO::Services::NovaCompute
      - OS::TripleO::Services::NovaLibvirt
+     - OS::TripleO::Services::NovaMigrationTarget
      - OS::TripleO::Services::MySQLClient
      - OS::TripleO::Services::Sshd
 +    - OS::TripleO::Services::Iscsid
  
  - name: Controller
    CountDefault: 1
diff --cc ci/environments/multinode-containers.yaml
index d86d25bd,9026f49f..7768c4f0
--- a/ci/environments/multinode-containers.yaml
+++ b/ci/environments/multinode-containers.yaml
@@@ -59,8 -60,8 +60,9 @@@ parameter_defaults
      - OS::TripleO::Services::TripleoPackages
      - OS::TripleO::Services::NovaCompute
      - OS::TripleO::Services::NovaLibvirt
+     - OS::TripleO::Services::NovaMigrationTarget
      - OS::TripleO::Services::Sshd
 +    - OS::TripleO::Services::Iscsid
    ControllerExtraConfig:
      nova::compute::libvirt::services::libvirt_virt_type: qemu
      nova::compute::libvirt::libvirt_virt_type: qemu
diff --cc ci/environments/multinode.yaml
index 0110915c,117dea0a..2b25e58e
--- a/ci/environments/multinode.yaml
+++ b/ci/environments/multinode.yaml
@@@ -57,8 -57,8 +57,9 @@@ parameter_defaults
      - OS::TripleO::Services::NovaLibvirt
      - OS::TripleO::Services::Horizon
      - OS::TripleO::Services::TripleoFirewall
+     - OS::TripleO::Services::NovaMigrationTarget
      - OS::TripleO::Services::Sshd
 +    - OS::TripleO::Services::Iscsid
    ControllerExtraConfig:
      nova::compute::libvirt::services::libvirt_virt_type: qemu
      nova::compute::libvirt::libvirt_virt_type: qemu
diff --cc environments/docker-services-tls-everywhere.yaml
index f6c1b210,51cb82a7..255726a1
--- a/environments/docker-services-tls-everywhere.yaml
+++ b/environments/docker-services-tls-everywhere.yaml
@@@ -20,8 -20,8 +20,9 @@@ resource_registry
    OS::TripleO::Services::HeatApi: ../docker/services/heat-api.yaml
    OS::TripleO::Services::HeatApiCfn: ../docker/services/heat-api-cfn.yaml
    OS::TripleO::Services::HeatEngine: ../docker/services/heat-engine.yaml
 +  OS::TripleO::Services::Iscsid: ../docker/services/iscsid.yaml
    OS::TripleO::Services::Keystone: ../docker/services/keystone.yaml
+   OS::TripleO::Services::NovaMigrationTarget: ../docker/services/nova-migration-target.yaml
    OS::TripleO::Services::NeutronApi: ../docker/services/neutron-api.yaml
    OS::TripleO::Services::NeutronCorePlugin: ../docker/services/neutron-plugin-ml2.yaml
    OS::TripleO::Services::NeutronDhcpAgent: ../docker/services/neutron-dhcp.yaml