openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Use puppet parameter to set swift_catalog_info in cinder"

Browse Source
This commit is contained in:
Zuul 2020-04-27 22:42:38 +00:00 committed by Gerrit Code Review
commit e7e20c5b0f
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deployment/cinder/cinder-api-container-puppet.yaml
View File

@ -185,10 +185,6 @@ outputs:
cinder::api::enable_proxy_headers_parsing: true cinder::api::enable_proxy_headers_parsing: true
cinder::api::nova_catalog_info: 'compute:nova:internalURL' 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} tripleo::profile::base::cinder::cinder_enable_db_purge: {get_param: CinderEnableDBPurge}
cinder::api::bind_host: cinder::api::bind_host:
str_replace: str_replace:

1
deployment/cinder/cinder-backup-container-puppet.yaml
View File

@ -126,6 +126,7 @@ outputs:
- {get_param: CephClusterName} - {get_param: CephClusterName}
- '.conf' - '.conf'
cinder::backup::swift::backup_swift_container: volumebackups 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_share: {get_param: CinderBackupNfsShare}
cinder::backup::nfs::backup_mount_options: {get_param: CinderBackupNfsMountOptions} cinder::backup::nfs::backup_mount_options: {get_param: CinderBackupNfsMountOptions}
service_config_settings: service_config_settings: