diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-12-01 13:01:14 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-12-01 13:01:14 +0000 |
| commit | ea3ace78398015578de77be5a782dfa6176decb7 (patch) | |
| tree | 9806ff6109463e8c5bcfcefe26052cf5a6fd85da /puppet/services/nova-compute.yaml | |
| parent | 096259f7140ec8476fcbb7605c90155079b0c6bc (diff) | |
| parent | 787685101179f13f6074901070cf307bd9bb0731 (diff) | |
Merge "Hiera optimization: use a new hiera hook"
Diffstat (limited to 'puppet/services/nova-compute.yaml')
| -rw-r--r-- | puppet/services/nova-compute.yaml | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/puppet/services/nova-compute.yaml b/puppet/services/nova-compute.yaml index f7f2510e..908b676e 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 @@ -97,11 +97,7 @@ 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::pci_passthrough: {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 @@ -117,7 +113,7 @@ outputs: - '.' - - 'client' - {get_param: CephClientUserName} - nova::compute::rbd::libvirt_rbd_secret_uuid: '"%{hiera(\"ceph::profile::params::fsid\")}"' + nova::compute::rbd::libvirt_rbd_secret_uuid: "%{hiera('ceph::profile::params::fsid')}" nova::compute::instance_usage_audit: true nova::compute::instance_usage_audit_period: 'hour' nova::compute::rbd::ephemeral_storage: {get_param: NovaEnableRbdBackend} |