Merge "Add NovaDisableImageDownloadToRbd parameter" into stable/train

openstack-archive · Jan 9, 2021 · fe14e30 · fe14e30
2 parents 835d052 + c6a5516
commit fe14e30
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 0 deletions.
diff --git a/deployment/nova/nova-compute-container-puppet.yaml b/deployment/nova/nova-compute-container-puppet.yaml
@@ -448,6 +448,14 @@ parameters:
       ownership and selinux context.
     default:
       - 'triliovault-mounts'
+  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.
@@ -551,6 +559,7 @@ resources:
               nova::compute::libvirt::libvirt_cpu_mode: NovaLibvirtCPUMode
               nova::compute::libvirt::libvirt_cpu_model: NovaLibvirtCPUModels
               nova::compute::libvirt::libvirt_cpu_model_extra_flags: NovaLibvirtCPUModelExtraFlags
+              nova::workarounds::never_download_image_if_on_rbd: NovaDisableImageDownloadToRbd
             - values: {get_param: [RoleParameters]}
           - values:
               NovaVcpuPinSet: {get_param: NovaVcpuPinSet}
@@ -629,6 +638,8 @@ resources:
               NovaLibvirtCPUMode: {get_param: NovaLibvirtCPUMode}
               NovaLibvirtCPUModels: {get_param: NovaLibvirtCPUModels}
               NovaLibvirtCPUModelExtraFlags: {get_param: NovaLibvirtCPUModelExtraFlags}
+              NovaDisableImageDownloadToRbd: {get_param: NovaDisableImageDownloadToRbd}
+
 
 conditions:
   insecure_registry_is_empty: {equals : [{get_param: DockerInsecureRegistryAddress}, []]}

diff --git a/environments/dcn-hci.yaml b/environments/dcn-hci.yaml
@@ -42,6 +42,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
@@ -29,6 +29,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
@@ -18,9 +18,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