Merge "Add support for SR-IOV enablement via neutron-api"

This commit is contained in:
Jenkins 2016-06-23 09:59:23 +00:00 committed by Gerrit Code Review
commit 5c9a385430
4 changed files with 14 additions and 0 deletions
hooks
templates

@ -102,6 +102,8 @@ class NeutronAPIContext(context.OSContextGenerator):
rdata.get('neutron-security-groups'),
'network_manager': 'neutron',
}
if rdata.get('enable-sriov'):
ctxt['additional_neutron_filters'] = 'PciPassthroughFilter'
if context_complete(ctxt):
return ctxt
return {}

@ -30,7 +30,11 @@ ec2_listen = {{ bind_host }}
osapi_compute_workers = {{ workers }}
ec2_workers = {{ workers }}
{% if additional_neutron_filters is defined %}
scheduler_default_filters = {{ scheduler_default_filters }},{{ additional_neutron_filters }}
{% else %}
scheduler_default_filters = {{ scheduler_default_filters }}
{% endif %}
cpu_allocation_ratio = {{ cpu_allocation_ratio }}
ram_allocation_ratio = {{ ram_allocation_ratio }}

@ -30,7 +30,11 @@ ec2_listen = {{ bind_host }}
osapi_compute_workers = {{ workers }}
ec2_workers = {{ workers }}
{% if additional_neutron_filters is defined %}
scheduler_default_filters = {{ scheduler_default_filters }},{{ additional_neutron_filters }}
{% else %}
scheduler_default_filters = {{ scheduler_default_filters }}
{% endif %}
cpu_allocation_ratio = {{ cpu_allocation_ratio }}
ram_allocation_ratio = {{ ram_allocation_ratio }}

@ -27,7 +27,11 @@ s3_listen = {{ bind_host }}
osapi_compute_workers = {{ workers }}
{% if additional_neutron_filters is defined %}
scheduler_default_filters = {{ scheduler_default_filters }},{{ additional_neutron_filters }}
{% else %}
scheduler_default_filters = {{ scheduler_default_filters }}
{% endif %}
cpu_allocation_ratio = {{ cpu_allocation_ratio }}
ram_allocation_ratio = {{ ram_allocation_ratio }}