summaryrefslogtreecommitdiffstats
path: root/puppet/services
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-08-29 14:20:45 +0000
committerGerrit Code Review <review@openstack.org>2016-08-29 14:20:45 +0000
commit31ea939c1a30327ce111b26947f44d1e59bc439f (patch)
treee52d687281b592061d9947a914be5b6da8729b0d /puppet/services
parent4c6a101511da96c8d1170c774e52ea8fd2046458 (diff)
parent67d3a774e55a6c27aa19d1f00de9cec4a02e7866 (diff)
Merge "Configure the pci_passthrough_whitelist via THT"
Diffstat (limited to 'puppet/services')
-rw-r--r--puppet/services/nova-compute.yaml19
1 files changed, 19 insertions, 0 deletions
diff --git a/puppet/services/nova-compute.yaml b/puppet/services/nova-compute.yaml
index 13ec03ea..6bc1c187 100644
--- a/puppet/services/nova-compute.yaml
+++ b/puppet/services/nova-compute.yaml
@@ -40,6 +40,19 @@ parameters:
default: ''
description: Libvirt VIF driver configuration for the network
type: string
+ NovaPCIPassthrough:
+ description: >
+ List of PCI Passthrough whitelist parameters.
+ Example -
+ NovaPCIPassthrough:
+ - vendor_id: "8086"
+ product_id: "154c"
+ address: "0000:05:00.0"
+ physical_network: "datacentre"
+ For different formats, refer to the nova.conf documentation for
+ pci_passthrough_whitelist configuration
+ type: json
+ default: ''
NovaVcpuPinSet:
description: >
A list or range of physical CPU cores to reserve for virtual machine
@@ -47,6 +60,7 @@ parameters:
Ex. NovaVcpuPinSet: ['4-12','^8'] will reserve cores from 4-12 excluding 8
type: comma_delimited_list
default: []
+
resources:
NovaBase:
type: ./nova-base.yaml
@@ -64,6 +78,11 @@ outputs:
map_merge:
- get_attr: [NovaBase, role_data, config_settings]
- nova::compute::libvirt::manage_libvirt_services: false
+ nova::compute::pci_passthrough:
+ str_replace:
+ template: "'JSON_PARAM'"
+ params:
+ JSON_PARAM: {get_param: NovaPCIPassthrough}
nova::compute::vcpu_pin_set: {get_param: NovaVcpuPinSet}
# we manage migration in nova common puppet profile
nova::compute::libvirt::migration_support: false