Remove no longer used NovaNfsEnabled parameter and condtion
With Id5503ed274bd5dc0c5365cc994de7e5cdcbc2fb6 the handling of /var/lib/nova on NFS changed and NovaNfsEnabled and nova_nfs_enabled condition is no longer used in most of the deployment files. This cleans up the no longer used parameter and condition in nova-compute-container-puppet.yaml, nova-ironic-container-puppet.yaml nova-libvirt-container-puppet.yaml and nova-migration-target-container-puppet.yaml Conflicts: deployment/nova/nova-libvirt-container-puppet.yaml Change-Id: I542956aef6da63a376790ec87d4767196ff85067 (cherry picked from commitd2f6a3be26
) (cherry picked from commitdf04e95181
) (cherry picked from commit98ba67989f
)
This commit is contained in:
parent
988c3fd13a
commit
20a03f22b3
|
@ -711,13 +711,6 @@ conditions:
|
|||
|
||||
is_not_additional_cell: {equals: [{get_param: NovaAdditionalCell}, false]}
|
||||
|
||||
nova_nfs_enabled:
|
||||
or:
|
||||
- and:
|
||||
- equals: [{get_param: NovaNfsEnabled}, true]
|
||||
- equals: [{get_param: [RoleParameters, NovaNfsEnabled]}, '']
|
||||
- equals: [{get_param: [RoleParameters, NovaNfsEnabled]}, true]
|
||||
|
||||
reserved_huge_pages_set:
|
||||
not:
|
||||
and:
|
||||
|
|
|
@ -44,12 +44,6 @@ parameters:
|
|||
default: false
|
||||
description: Whether to enable the multipath daemon
|
||||
type: boolean
|
||||
NovaNfsEnabled:
|
||||
default: false
|
||||
description: Whether to enable or not the NFS backend for Nova
|
||||
type: boolean
|
||||
tags:
|
||||
- role_specific
|
||||
IronicApiMaxRetries:
|
||||
description: The number of times to retry when a request conflicts. If set to 0, only try once, no retries.
|
||||
type: number
|
||||
|
@ -65,12 +59,6 @@ parameters:
|
|||
|
||||
conditions:
|
||||
|
||||
nova_nfs_enabled:
|
||||
or:
|
||||
- and:
|
||||
- equals: [{get_param: NovaNfsEnabled}, true]
|
||||
- equals: [{get_param: [RoleParameters, NovaNfsEnabled]}, '']
|
||||
- equals: [{get_param: [RoleParameters, NovaNfsEnabled]}, true]
|
||||
ironic_api_max_retry_cond:
|
||||
equals: [{get_param: IronicApiMaxRetries}, -1]
|
||||
|
||||
|
|
|
@ -238,12 +238,6 @@ parameters:
|
|||
description: The password for the libvirt service when TLS is enabled
|
||||
type: string
|
||||
hidden: true
|
||||
NovaNfsEnabled:
|
||||
default: false
|
||||
description: Whether to enable or not the NFS backend for Nova
|
||||
type: boolean
|
||||
tags:
|
||||
- role_specific
|
||||
QemuDefaultTLSVerify:
|
||||
description: >
|
||||
Whether to enable or disable TLS client certificate verification. Enabling this
|
||||
|
@ -346,13 +340,6 @@ conditions:
|
|||
- {get_param: QemuCACert}
|
||||
- ''
|
||||
|
||||
nova_nfs_enabled:
|
||||
or:
|
||||
- and:
|
||||
- equals: [{get_param: NovaNfsEnabled}, true]
|
||||
- equals: [{get_param: [RoleParameters, NovaNfsEnabled]}, '']
|
||||
- equals: [{get_param: [RoleParameters, NovaNfsEnabled]}, true]
|
||||
|
||||
key_size_libvirt_override_unset: {equals: [{get_param: LibvirtCertificateKeySize}, '']}
|
||||
key_size_libvirtvnc_override_unset: {equals: [{get_param: LibvirtVNCServerCertificateKeySize}, '']}
|
||||
key_size_qemu_client_override_unset: {equals: [{get_param: QemuClientCertificateKeySize}, '']}
|
||||
|
|
|
@ -54,12 +54,6 @@ parameters:
|
|||
default: 2022
|
||||
description: Target port for migration over ssh
|
||||
type: number
|
||||
NovaNfsEnabled:
|
||||
default: false
|
||||
description: Whether to enable or not the NFS backend for Nova
|
||||
type: boolean
|
||||
tags:
|
||||
- role_specific
|
||||
|
||||
resources:
|
||||
|
||||
|
@ -75,14 +69,6 @@ resources:
|
|||
RoleName: {get_param: RoleName}
|
||||
RoleParameters: {get_param: RoleParameters}
|
||||
|
||||
conditions:
|
||||
nova_nfs_enabled:
|
||||
or:
|
||||
- and:
|
||||
- equals: [{get_param: NovaNfsEnabled}, true]
|
||||
- equals: [{get_param: [RoleParameters, NovaNfsEnabled]}, '']
|
||||
- equals: [{get_param: [RoleParameters, NovaNfsEnabled]}, true]
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the Nova Migration Target service.
|
||||
|
|
Loading…
Reference in New Issue