summaryrefslogtreecommitdiffstats
path: root/apex
diff options
context:
space:
mode:
authorFeng Pan <fpan@redhat.com>2017-09-26 23:33:08 -0400
committerTim Rozet <trozet@redhat.com>2017-09-28 17:31:39 +0000
commit924fd4c07a19029188b315f5aca716b03665f79f (patch)
treee8d35ee549bb990b9038c654017a034379e14587 /apex
parent40eedda05c1757b3b0810ac088c1b067fa325dd1 (diff)
Fix RT KVM scenario
Also change first-boot.yaml to handle updated kernel for rt kvm Change-Id: I66b7159731dd286c4a97ba4f3583e229afbb73b3 Signed-off-by: Feng Pan <fpan@redhat.com> (cherry picked from commit 68095d704d1aea94f5890f54eefa13929aab737c)
Diffstat (limited to 'apex')
-rw-r--r--apex/overcloud/overcloud_deploy.py22
1 files changed, 10 insertions, 12 deletions
diff --git a/apex/overcloud/overcloud_deploy.py b/apex/overcloud/overcloud_deploy.py
index 20fb4a60..99311748 100644
--- a/apex/overcloud/overcloud_deploy.py
+++ b/apex/overcloud/overcloud_deploy.py
@@ -100,7 +100,6 @@ def create_deploy_cmd(ds, ns, inv, tmp_dir,
ds_opts = ds['deploy_options']
deploy_options += build_sdn_env_list(ds_opts, SDN_FILE_MAP)
- # TODO(trozet): make sure rt kvm file is in tht dir
for k, v in OTHER_FILE_MAP.items():
if k in ds_opts and ds_opts[k]:
deploy_options.append(os.path.join(con.THT_ENV_DIR, v))
@@ -418,17 +417,16 @@ def prep_env(ds, ns, opnfv_env, net_env, tmp_dir):
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"
- " OS::TripleO::NodeUserData: first-boot.yaml")
- elif 'NovaSchedulerDefaultFilters' in line:
- print(" NovaSchedulerDefaultFilters: 'RamFilter,"
- "ComputeFilter,AvailabilityZoneFilter,"
- "ComputeCapabilitiesFilter,ImagePropertiesFilter,"
- "NUMATopologyFilter'")
- else:
- print(line)
+ elif ((perf and perf_kern_comp) or ds_opts.get('rt_kvm')) and \
+ 'resource_registry' in line:
+ print("resource_registry:\n"
+ " OS::TripleO::NodeUserData: first-boot.yaml")
+ elif perf and perf_kern_comp and \
+ 'NovaSchedulerDefaultFilters' in line:
+ print(" NovaSchedulerDefaultFilters: 'RamFilter,"
+ "ComputeFilter,AvailabilityZoneFilter,"
+ "ComputeCapabilitiesFilter,ImagePropertiesFilter,"
+ "NUMATopologyFilter'")
else:
print(line)