diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-04-19 10:45:48 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-04-19 10:45:48 +0000 |
| commit | 1fa377d565e1649281f01883811cd7e899fce9d1 (patch) | |
| tree | 1ee152e7f468addc96f60fccafbf14a4bb65ca42 /puppet | |
| parent | f4390ffeba71a3c6d94399dffd8e7d022696add7 (diff) | |
| parent | 8a4c6cbdf5e70b92f2e6b123f36545c957425d08 (diff) | |
Merge "Modify pci_passthrough hiera value as string" into stable/ocata
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/services/nova-compute.yaml | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/puppet/services/nova-compute.yaml b/puppet/services/nova-compute.yaml index d208bede..a9737eb6 100644 --- a/puppet/services/nova-compute.yaml +++ b/puppet/services/nova-compute.yaml @@ -52,7 +52,7 @@ parameters: For different formats, refer to the nova.conf documentation for pci_passthrough_whitelist configuration type: json - default: {} + default: '' NovaVcpuPinSet: description: > A list or range of physical CPU cores to reserve for virtual machine @@ -101,7 +101,11 @@ outputs: map_merge: - get_attr: [NovaBase, role_data, config_settings] - nova::compute::libvirt::manage_libvirt_services: false - nova::compute::pci_passthrough: {get_param: NovaPCIPassthrough} + nova::compute::pci_passthrough: + str_replace: + template: "JSON_PARAM" + params: + JSON_PARAM: {get_param: NovaPCIPassthrough} nova::compute::vcpu_pin_set: {get_param: NovaVcpuPinSet} nova::compute::reserved_host_memory: {get_param: NovaReservedHostMemory} # we manage migration in nova common puppet profile |