Merge "Add NovaDisableImageDownloadToRbd parameter"

openstack-archive · Oct 28, 2020 · bd909bd · bd909bd
2 parents f06e502 + b756944
commit bd909bd
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 0 deletions.
diff --git a/deployment/nova/nova-compute-container-puppet.yaml b/deployment/nova/nova-compute-container-puppet.yaml
@@ -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:

diff --git a/environments/dcn-hci.yaml b/environments/dcn-hci.yaml
@@ -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

diff --git a/environments/dcn.yaml b/environments/dcn.yaml
@@ -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

diff --git a/sample-env-generator/dcn.yaml b/sample-env-generator/dcn.yaml
@@ -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