diff --git a/deployment/nova/nova-compute-container-puppet.yaml b/deployment/nova/nova-compute-container-puppet.yaml index 3567f38381..70d6df79af 100644 --- a/deployment/nova/nova-compute-container-puppet.yaml +++ b/deployment/nova/nova-compute-container-puppet.yaml @@ -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: diff --git a/deployment/nova/nova-ironic-container-puppet.yaml b/deployment/nova/nova-ironic-container-puppet.yaml index 0de8d3db76..13e2adacf7 100644 --- a/deployment/nova/nova-ironic-container-puppet.yaml +++ b/deployment/nova/nova-ironic-container-puppet.yaml @@ -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] diff --git a/deployment/nova/nova-libvirt-container-puppet.yaml b/deployment/nova/nova-libvirt-container-puppet.yaml index 6b3bf0d92b..b77eb80a6f 100644 --- a/deployment/nova/nova-libvirt-container-puppet.yaml +++ b/deployment/nova/nova-libvirt-container-puppet.yaml @@ -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}, '']} diff --git a/deployment/nova/nova-migration-target-container-puppet.yaml b/deployment/nova/nova-migration-target-container-puppet.yaml index dbae805157..49fb9c73e7 100644 --- a/deployment/nova/nova-migration-target-container-puppet.yaml +++ b/deployment/nova/nova-migration-target-container-puppet.yaml @@ -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.