Merge "Use puppet parameter to set swift_catalog_info in cinder"
This commit is contained in:
commit
e7e20c5b0f
@ -185,10 +185,6 @@ outputs:
|
||||
cinder::api::enable_proxy_headers_parsing: true
|
||||
|
||||
cinder::api::nova_catalog_info: 'compute:nova:internalURL'
|
||||
# TODO(emilien) move it to puppet-cinder
|
||||
cinder::config:
|
||||
DEFAULT/swift_catalog_info:
|
||||
value: 'object-store:swift:internalURL'
|
||||
tripleo::profile::base::cinder::cinder_enable_db_purge: {get_param: CinderEnableDBPurge}
|
||||
cinder::api::bind_host:
|
||||
str_replace:
|
||||
|
@ -126,6 +126,7 @@ outputs:
|
||||
- {get_param: CephClusterName}
|
||||
- '.conf'
|
||||
cinder::backup::swift::backup_swift_container: volumebackups
|
||||
cinder::backup::swift::swift_catalog_info: 'object-store:swift:internalURL'
|
||||
cinder::backup::nfs::backup_share: {get_param: CinderBackupNfsShare}
|
||||
cinder::backup::nfs::backup_mount_options: {get_param: CinderBackupNfsMountOptions}
|
||||
service_config_settings:
|
||||
|
Loading…
Reference in New Issue
Block a user