openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Fix NovaNfs role parameter precedence in conditions 

I2702a022565a130ab339d165cb2252ad67d1162e changed the Nova NFS params to be
role specific, however the global param still takes precedence in the
enable_live_migration_tunnelled condition.
With this change the the global param is only considered when the role
specific param is not set.

Change-Id: I3d1a0f632e8a7e4924ebabdc795c0ef5d53cdd6d
Related-Bug: 1823712
(cherry picked from commit 32bf12e20e)
(cherry picked from commit 53fbc70e7a)
(cherry picked from commit dd46170b74)
This commit is contained in:
Oliver Walsh 2019-05-14 17:06:13 +01:00 committed by Piotr Kopec
parent 10a6610f4c
commit 5187416181
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
puppet/services/nova-compute.yaml
View File

@ -189,7 +189,9 @@ parameters:
conditions:
enable_live_migration_tunnelled:
or:
- equals: [{get_param: NovaNfsEnabled}, true]
- and:
- equals: [{get_param: NovaNfsEnabled}, true]
- equals: [{get_param: [RoleParameters, NovaNfsEnabled]}, '']
- equals: [{get_param: [RoleParameters, NovaNfsEnabled]}, true]
- equals: [{get_param: NovaEnableRbdBackend}, true]