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
)
This commit is contained in:
parent
5db67d9929
commit
53fbc70e7a
|
@ -357,7 +357,9 @@ 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]
|
||||
|
||||
|
|
Loading…
Reference in New Issue