Merge "Fix nosdn fdio scenario"

diff --git a/apex/overcloud/deploy.py b/apex/overcloud/deploy.py
index 9ebad17..03e5652 100644 (file)
--- a/apex/overcloud/deploy.py
+++ b/apex/overcloud/deploy.py
@@ -408,14 +408,6 @@ def prep_image(ds, ns, img, tmp_dir, root_pw=None, docker_tag=None,
         if docker_tag:
             patched_containers = patched_containers.union({'opendaylight'})
 
-    if sdn == 'ovn':
-        virt_cmds.extend([
-            {con.VIRT_RUN_CMD: "cd /root/ovs28 && yum update -y "
-                               "*openvswitch*"},
-            {con.VIRT_RUN_CMD: "cd /root/ovs28 && yum downgrade -y "
-                               "*openvswitch*"}
-        ])
-
     if patches:
         if ds_opts['os_version'] == 'master':
             branch = ds_opts['os_version']

diff --git a/build/opnfv-environment.yaml b/build/opnfv-environment.yaml
index 3df18e9..84bd2f7 100644 (file)
--- a/build/opnfv-environment.yaml
+++ b/build/opnfv-environment.yaml
@@ -172,6 +172,7 @@ parameter_defaults:
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::NovaCompute
     - OS::TripleO::Services::NovaLibvirt
+    - OS::TripleO::Services::NovaMigrationTarget
     - OS::TripleO::Services::Kernel
     - OS::TripleO::Services::ComputeNeutronCorePlugin
     - OS::TripleO::Services::ComputeNeutronOvsAgent