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

diff --cc ci/environments/multinode-3nodes.yaml
index 72d01ed,bf68ec9..e040b01
--- 1/ci/environments/multinode-3nodes.yaml
--- 2/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 d86d25b,9026f49..7768c4f
--- 1/ci/environments/multinode-containers.yaml
--- 2/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 0110915,117dea0..2b25e58
--- 1/ci/environments/multinode.yaml
--- 2/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 ci/environments/multinode_major_upgrade.yaml
Simple merge

diff --cc ci/environments/scenario001-multinode-containers.yaml
Simple merge

diff --cc ci/environments/scenario001-multinode.yaml
Simple merge

diff --cc ci/environments/scenario002-multinode-containers.yaml
Simple merge

diff --cc ci/environments/scenario002-multinode.yaml
Simple merge

diff --cc ci/environments/scenario003-multinode-containers.yaml
Simple merge

diff --cc ci/environments/scenario003-multinode.yaml
Simple merge

diff --cc ci/environments/scenario004-multinode-containers.yaml
Simple merge

diff --cc ci/environments/scenario004-multinode.yaml
Simple merge

diff --cc deployed-server/deployed-server-roles-data.yaml
Simple merge

diff --cc docker/services/nova-compute.yaml
Simple merge

diff --cc docker/services/nova-libvirt.yaml
Simple merge

diff --cc environments/contrail/roles_data_contrail.yaml
Simple merge

diff --cc environments/docker-services-tls-everywhere.yaml
index f6c1b21,51cb82a..255726a
--- 1/environments/docker-services-tls-everywhere.yaml
--- 2/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

diff --cc overcloud-resource-registry-puppet.j2.yaml
Simple merge

diff --cc roles/README.rst
Simple merge

diff --cc roles_data.yaml
Simple merge