openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Fix Nova/Libvirt memory backed file conditions when they are role params"

Browse Source
This commit is contained in:
Zuul 2019-03-28 18:47:43 +00:00 committed by Gerrit Code Review
commit 0deae042ad
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment/nova/nova-compute-container-puppet.yaml
View File

@ -343,7 +343,9 @@ conditions:
not:
or:
- equals: [{get_param: NovaLibvirtFileBackedMemory}, '']
- equals: [{get_param: [RoleParameters, NovaLibvirtFileBackedMemory]}, '']
- equals: [{get_param: NovaLibvirtFileBackedMemory}, 0]
- equals: [{get_param: [RoleParameters, NovaLibvirtFileBackedMemory]}, 0]
is_not_additional_cell: {equals: [{get_param: NovaAdditionalCell}, false]}

10
deployment/nova/nova-libvirt-container-puppet.yaml
View File

@ -242,9 +242,13 @@ conditions:
memory_backing_dir_set:
not:
equals:
- {get_param: QemuMemoryBackingDir}
- ''
and:
- equals:
- {get_param: QemuMemoryBackingDir}
- ''
- equals:
- {get_param: [RoleParameters, QemuMemoryBackingDir]}
- ''
use_tls_for_nbd:
and: