Merge "Fixes BgpVpn service name and tht fixes"

diff --git a/apex/overcloud/overcloud_deploy.py b/apex/overcloud/overcloud_deploy.py
index f7a8b95..20fb4a6 100644 (file)
--- a/apex/overcloud/overcloud_deploy.py
+++ b/apex/overcloud/overcloud_deploy.py
@@ -402,10 +402,10 @@ def prep_env(ds, ns, opnfv_env, net_env, tmp_dir):
                 if kernel_args:
                     output_line = "  ComputeKernelArgs: '{}'".\
                         format(kernel_args)
-            elif ds_opts['dataplane'] == 'ovs_dpdk' and perf_ovs_comp:
+            if ds_opts['dataplane'] == 'ovs_dpdk' and perf_ovs_comp:
                 for k, v in OVS_PERF_MAP.items():
                     if k in line and v in perf_ovs_comp:
-                        output_line = "  {}: {}".format(k, perf_ovs_comp[v])
+                        output_line = "  {}: '{}'".format(k, perf_ovs_comp[v])
 
         print(output_line)
 
@@ -414,12 +414,10 @@ def prep_env(ds, ns, opnfv_env, net_env, tmp_dir):
     # Modify Network environment
     for line in fileinput.input(net_env, inplace=True):
         line = line.strip('\n')
-        if ds_opts['dataplane'] == 'ovs_dpdk':
-            if 'ComputeExtraConfigPre' in line:
-                print('  OS::TripleO::ComputeExtraConfigPre: '
-                      './ovs-dpdk-preconfig.yaml')
-            else:
-                print(line)
+        if 'ComputeExtraConfigPre' in line and \
+                ds_opts['dataplane'] == 'ovs_dpdk':
+            print('  OS::TripleO::ComputeExtraConfigPre: '
+                  './ovs-dpdk-preconfig.yaml')
         elif perf and perf_kern_comp:
             if 'resource_registry' in line:
                 print("resource_registry:\n"

diff --git a/build/opnfv-environment.yaml b/build/opnfv-environment.yaml
index 6dce7bd..a273265 100644 (file)
--- a/build/opnfv-environment.yaml
+++ b/build/opnfv-environment.yaml
@@ -12,7 +12,8 @@ parameter_defaults:
   NeutronEnableDHCPMetadata: true
   NeutronEnableIsolatedMetadata: true
   # NeutronDhcpAgentsPerNetwork: 3
-  NeutronPluginExtensions: 'qos,port_security,data_plane_status'
+  NeutronPluginExtensions: 'qos,port_security,neutron.plugins.ml2.extensions.\
+                            data_plane_status:DataPlaneStatusExtensionDriver'
   # TODO: VLAN Ranges should be configurable from network settings
   NeutronNetworkVLANRanges: 'datacentre:500:525'
   # NeutronVPPAgentPhysnets: