Add NovaDisableImageDownloadToRbd parameter

This exposes the nova workaround to disable downloading images from glance to
rbd (vs a cheap COW clone) when nova-compute and glance are not backed by the
same ceph cluster.

Related nova change: I069b6b1d28eaf1eee5c7fb8d0fdef9c0c229a1bf
Depends-On: I8329810d6c047c0d94e7b123e7cdc1263a7856cd

Change-Id: Ib5478e53eb1f216bf6924ff30ea8502cb8529d00
This commit is contained in:
Oliver Walsh 2020-10-21 17:00:52 +01:00
parent eb53dd1923
commit b756944d45
4 changed files with 22 additions and 0 deletions

View File

@ -492,6 +492,14 @@ parameters:
default: ''
tags:
- role_specific
NovaDisableImageDownloadToRbd:
type: boolean
description: >
Refuse to boot an instance if it would require downloading from glance and
uploading to ceph instead of a COW clone.
default: false
tags:
- role_specific
# DEPRECATED: the following options are deprecated and are currently maintained
# for backwards compatibility. They will be removed in future release.
@ -600,6 +608,7 @@ resources:
nova::compute::libvirt::cpu_model_extra_flags: NovaLibvirtCPUModelExtraFlags
nova_compute_opt_volumes: NovaComputeOptVolumes
nova_compute_opt_env_vars: NovaComputeOptEnvVars
nova::workarounds::never_download_image_if_on_rbd: NovaDisableImageDownloadToRbd
- values: {get_param: [RoleParameters]}
- values:
NovaVcpuPinSet: {get_param: NovaVcpuPinSet}
@ -683,6 +692,7 @@ resources:
NovaLibvirtCPUModelExtraFlags: {get_param: NovaLibvirtCPUModelExtraFlags}
NovaComputeOptVolumes: {get_param: NovaComputeOptVolumes}
NovaComputeOptEnvVars: {get_param: NovaComputeOptEnvVars}
NovaDisableImageDownloadToRbd: {get_param: NovaDisableImageDownloadToRbd}
conditions:

View File

@ -38,6 +38,10 @@ parameter_defaults:
# Type: boolean
NovaCrossAZAttach: False
# Refuse to boot an instance if it would require downloading from glance and uploading to ceph instead of a COW clone.
# Type: boolean
NovaDisableImageDownloadToRbd: True
resource_registry:
OS::TripleO::Network::Ports::OVNDBsVipPort: ../network/ports/noop.yaml
OS::TripleO::Network::Ports::RedisVipPort: ../network/ports/noop.yaml

View File

@ -21,6 +21,10 @@ parameter_defaults:
# Type: boolean
NovaCrossAZAttach: False
# Refuse to boot an instance if it would require downloading from glance and uploading to ceph instead of a COW clone.
# Type: boolean
NovaDisableImageDownloadToRbd: True
resource_registry:
OS::TripleO::Network::Ports::OVNDBsVipPort: ../network/ports/noop.yaml
OS::TripleO::Network::Ports::RedisVipPort: ../network/ports/noop.yaml

View File

@ -14,9 +14,13 @@ environments:
deployment/nova/nova-base-puppet.yaml:
parameters:
- NovaCrossAZAttach
deployment/nova/nova-compute-container-puppet.yaml:
parameters:
- NovaDisableImageDownloadToRbd
sample_values: &sample_values
ManageNetworks: false
NovaCrossAZAttach: false
NovaDisableImageDownloadToRbd: true
resource_registry: &dcn_resource_registry
OS::TripleO::Network::Ports::RedisVipPort: ../network/ports/noop.yaml
OS::TripleO::Network::Ports::OVNDBsVipPort: ../network/ports/noop.yaml