Browse Source

Merge "Remove no longer used NovaNfsEnabled parameter and condtion"

changes/22/786022/1
Zuul 1 year ago committed by Gerrit Code Review
parent
commit
39c393b3c2
  1. 7
      deployment/nova/nova-compute-container-puppet.yaml
  2. 12
      deployment/nova/nova-ironic-container-puppet.yaml
  3. 13
      deployment/nova/nova-libvirt-container-puppet.yaml
  4. 14
      deployment/nova/nova-migration-target-container-puppet.yaml

7
deployment/nova/nova-compute-container-puppet.yaml

@ -991,13 +991,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:

12
deployment/nova/nova-ironic-container-puppet.yaml

@ -45,12 +45,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
@ -66,12 +60,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]

13
deployment/nova/nova-libvirt-container-puppet.yaml

@ -229,12 +229,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
LibvirtLogFilters:
description: Defines a filter in libvirt daemon to select a different
logging level for a given category log outputs, as specified
@ -339,13 +333,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}, '']}

14
deployment/nova/nova-migration-target-container-puppet.yaml

@ -51,12 +51,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:
@ -71,14 +65,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…
Cancel
Save