Merge "Include copy-image for GlanceEnabledImportMethods for dcn-hci"
This commit is contained in:
commit
8471fceb6c
deployment/glance
environments
sample-env-generator
@ -165,7 +165,7 @@ parameters:
|
||||
default: 'web-download'
|
||||
description: >
|
||||
List of enabled Image Import Methods. Valid values in the list are
|
||||
'glance-direct' and 'web-download'
|
||||
'glance-direct', 'web-download', or 'copy-image'
|
||||
type: comma_delimited_list
|
||||
GlanceStagingNfsShare:
|
||||
default: ''
|
||||
|
@ -22,13 +22,9 @@ parameter_defaults:
|
||||
# Type: string
|
||||
CinderVolumeCluster: dcn
|
||||
|
||||
# Enable Glance Image Cache
|
||||
# Type: boolean
|
||||
GlanceCacheEnabled: False
|
||||
|
||||
# The upper limit on cache size, in bytes, after which the cache-pruner cleans up the image cache.
|
||||
# Type: number
|
||||
GlanceImageCacheMaxSize: 10737418240
|
||||
# List of enabled Image Import Methods. Valid values in the list are 'glance-direct', 'web-download', or 'copy-image'
|
||||
# Type: comma_delimited_list
|
||||
GlanceEnabledImportMethods: web-download,copy-image
|
||||
|
||||
# Manage the network and related resources (subnets and segments) with either create, update, or delete operations (depending on the stack operation). Does not apply to ports which will always be managed as needed. Defaults to true. For multi-stack use cases where the network related resources have already been managed by a separate stack, this parameter can be set to false.
|
||||
# Type: boolean
|
||||
|
@ -9,14 +9,6 @@
|
||||
# Environment file for deploying a remote site of distributed compute nodes
|
||||
# (DCN) in a separate stack (multi-stack) deployment.
|
||||
parameter_defaults:
|
||||
# Enable Glance Image Cache
|
||||
# Type: boolean
|
||||
GlanceCacheEnabled: False
|
||||
|
||||
# The upper limit on cache size, in bytes, after which the cache-pruner cleans up the image cache.
|
||||
# Type: number
|
||||
GlanceImageCacheMaxSize: 10737418240
|
||||
|
||||
# Manage the network and related resources (subnets and segments) with either create, update, or delete operations (depending on the stack operation). Does not apply to ports which will always be managed as needed. Defaults to true. For multi-stack use cases where the network related resources have already been managed by a separate stack, this parameter can be set to false.
|
||||
# Type: boolean
|
||||
ManageNetworks: False
|
||||
|
@ -9,7 +9,7 @@
|
||||
# Configure and include this environment to enable the use of an NFS
|
||||
# share as the backend for Glance.
|
||||
parameter_defaults:
|
||||
# List of enabled Image Import Methods. Valid values in the list are 'glance-direct' and 'web-download'
|
||||
# List of enabled Image Import Methods. Valid values in the list are 'glance-direct', 'web-download', or 'copy-image'
|
||||
# Type: comma_delimited_list
|
||||
GlanceEnabledImportMethods: web-download
|
||||
|
||||
|
@ -5,10 +5,6 @@ environments:
|
||||
Environment file for deploying a remote site of distributed compute nodes
|
||||
(DCN) in a separate stack (multi-stack) deployment.
|
||||
files: &dcn_files
|
||||
deployment/glance/glance-api-container-puppet.yaml:
|
||||
parameters:
|
||||
- GlanceCacheEnabled
|
||||
- GlanceImageCacheMaxSize
|
||||
deployment/nova/nova-az-config.yaml:
|
||||
parameters:
|
||||
- NovaComputeAvailabilityZone
|
||||
@ -43,11 +39,15 @@ environments:
|
||||
parameters:
|
||||
- CinderVolumeCluster
|
||||
- CinderEtcdLocalConnect
|
||||
deployment/glance/glance-api-container-puppet.yaml:
|
||||
parameters:
|
||||
- GlanceEnabledImportMethods
|
||||
sample_values:
|
||||
<<: *sample_values
|
||||
CinderStorageAvailabilityZone: dcn
|
||||
CinderVolumeCluster: dcn
|
||||
CinderEtcdLocalConnect: True
|
||||
GlanceEnabledImportMethods: web-download,copy-image
|
||||
resource_registry:
|
||||
<<: *dcn_resource_registry
|
||||
OS::TripleO::Services::Etcd: ../deployment/etcd/etcd-container-puppet.yaml
|
||||
|
Loading…
x
Reference in New Issue
Block a user