Browse Source

Merge "Remove no longer used NovaNfsEnabled parameter and condtion" into stable/victoria

changes/46/787746/1
Zuul 3 weeks ago
committed by Gerrit Code Review
parent
commit
aba63e822f
4 changed files with 0 additions and 46 deletions
  1. +0
    -7
      deployment/nova/nova-compute-container-puppet.yaml
  2. +0
    -12
      deployment/nova/nova-ironic-container-puppet.yaml
  3. +0
    -13
      deployment/nova/nova-libvirt-container-puppet.yaml
  4. +0
    -14
      deployment/nova/nova-migration-target-container-puppet.yaml

+ 0
- 7
deployment/nova/nova-compute-container-puppet.yaml View File

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


+ 0
- 12
deployment/nova/nova-ironic-container-puppet.yaml View File

@ -48,12 +48,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
@ -69,12 +63,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]


+ 0
- 13
deployment/nova/nova-libvirt-container-puppet.yaml View File

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


+ 0
- 14
deployment/nova/nova-migration-target-container-puppet.yaml View File

@ -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…
Cancel
Save