From 219e6142d2714e0375600180760ce095bd313c87 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Tue, 21 Apr 2020 23:00:57 +0900 Subject: [PATCH] Use puppet parameter to set swift_catalog_info in cinder Depends-on: https://review.opendev.org/#/c/721542/ Change-Id: I25f05011f2c1ae60fdaab4ba34e7810b3602610b --- deployment/cinder/cinder-api-container-puppet.yaml | 4 ---- deployment/cinder/cinder-backup-container-puppet.yaml | 1 + 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/deployment/cinder/cinder-api-container-puppet.yaml b/deployment/cinder/cinder-api-container-puppet.yaml index df6ed055e8..9ef764763a 100644 --- a/deployment/cinder/cinder-api-container-puppet.yaml +++ b/deployment/cinder/cinder-api-container-puppet.yaml @@ -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: diff --git a/deployment/cinder/cinder-backup-container-puppet.yaml b/deployment/cinder/cinder-backup-container-puppet.yaml index 18b2675549..4b2787c42d 100644 --- a/deployment/cinder/cinder-backup-container-puppet.yaml +++ b/deployment/cinder/cinder-backup-container-puppet.yaml @@ -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: