Merge "Add NovaImageTypeExcludeList parameter"

deployment/nova/nova-compute-container-puppet.yaml

@@ -520,6 +520,14 @@ parameters:
       ownership and selinux context.
     default:
       - 'triliovault-mounts'
+  NovaImageTypeExcludeList:
+    type: comma_delimited_list
+    description: >
+      List of image formats that should not be advertised as supported by the compute
+      service.
+    default: []
+    tags:
+      - role_specific
 
   # DEPRECATED: the following options are deprecated and are currently maintained
   # for backwards compatibility. They will be removed in future release.
@@ -626,6 +634,7 @@ resources:
               nova_compute_opt_volumes: NovaComputeOptVolumes
               nova_compute_opt_env_vars: NovaComputeOptEnvVars
               nova::workarounds::never_download_image_if_on_rbd: NovaDisableImageDownloadToRbd
+              nova::compute::image_type_exclude_list: NovaImageTypeExcludeList
             - values: {get_param: [RoleParameters]}
           - values:
               NovaVcpuPinSet: {get_param: NovaVcpuPinSet}
@@ -710,6 +719,7 @@ resources:
               NovaComputeOptVolumes: {get_param: NovaComputeOptVolumes}
               NovaComputeOptEnvVars: {get_param: NovaComputeOptEnvVars}
               NovaDisableImageDownloadToRbd: {get_param: NovaDisableImageDownloadToRbd}
+              NovaImageTypeExcludeList: {get_param: NovaImageTypeExcludeList}
 
 
 conditions: