diff options
author | Saravanan KR <skramaja@redhat.com> | 2017-03-22 19:40:29 +0530 |
---|---|---|
committer | Saravanan KR <skramaja@redhat.com> | 2017-03-29 04:22:00 +0000 |
commit | 8a4c6cbdf5e70b92f2e6b123f36545c957425d08 (patch) | |
tree | 73bc12d942cb9979f76ea6f81a2dd6b81c63e2b2 /puppet/services | |
parent | e2f1a56e80c43d69b6e725e5620864229ecdba7f (diff) |
Modify pci_passthrough hiera value as string
Hiera value of nova::compute::pci_passthrough should be a string.
It has been modified to JSON with the heira hook changes. Modifying
it again back to string.
Closes-Bug: #1675036
Change-Id: I441907ff313ecc5b7b4da562c6be195687fc6c76
(cherry picked from commit 57c06ddefd4d7ff87de02dab9d1c5e92eb8e6eef)
Diffstat (limited to 'puppet/services')
-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 |