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 commit32bf12e20e
) (cherry picked from commit53fbc70e7a
) (cherry picked from commitdd46170b74
)
This commit is contained in:
parent
10a6610f4c
commit
5187416181
@ -189,7 +189,9 @@ parameters:
|
|||||||
conditions:
|
conditions:
|
||||||
enable_live_migration_tunnelled:
|
enable_live_migration_tunnelled:
|
||||||
or:
|
or:
|
||||||
|
- and:
|
||||||
- equals: [{get_param: NovaNfsEnabled}, true]
|
- equals: [{get_param: NovaNfsEnabled}, true]
|
||||||
|
- equals: [{get_param: [RoleParameters, NovaNfsEnabled]}, '']
|
||||||
- equals: [{get_param: [RoleParameters, NovaNfsEnabled]}, true]
|
- equals: [{get_param: [RoleParameters, NovaNfsEnabled]}, true]
|
||||||
- equals: [{get_param: NovaEnableRbdBackend}, true]
|
- equals: [{get_param: NovaEnableRbdBackend}, true]
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user