From 68095d704d1aea94f5890f54eefa13929aab737c Mon Sep 17 00:00:00 2001 From: Feng Pan Date: Tue, 26 Sep 2017 23:33:08 -0400 Subject: Fix RT KVM scenario Also change first-boot.yaml to handle updated kernel for rt kvm Change-Id: I66b7159731dd286c4a97ba4f3583e229afbb73b3 Signed-off-by: Feng Pan --- apex/overcloud/overcloud_deploy.py | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to 'apex/overcloud') 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) -- cgit 1.2.3-korg