From f1c462054fe302ab6cbf170ab71c0c8edfba680a Mon Sep 17 00:00:00 2001 From: Feng Pan Date: Tue, 26 Sep 2017 09:22:19 -0400 Subject: Fix ovs-dpdk failures - Add quotes to ovs config options in opnfv-environment.yaml - Fixed an error where we don't populate kernel paramaters when ovs-dpdk is enabled Change-Id: I7579358411a844e9d0c34ca53701f12f46ef7c13 Signed-off-by: Feng Pan --- apex/overcloud/overcloud_deploy.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/apex/overcloud/overcloud_deploy.py b/apex/overcloud/overcloud_deploy.py index f7a8b954..20fb4a60 100644 --- 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" -- cgit 1.2.3-korg