openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Add swift_config puppet-tag for swift-ringbuilder 

ConfigParser in python3 is not happy with the default
config(contain %%) shipped with swift package[1]. So while applying
puppet manifest for swift-ringbuilder default config from
package is used(as swift_config tag doesn't exist in puppet-tags),
this patch adds it, so swift-ringbuilder uses the generated config
instead of package defaults.

[1] https://github.com/rdo-packages/swift-distgit/blob/rpm-master/swift.conf

Closes-Bug: #1836572
Change-Id: I737b85393e9ce13bda279dc0388bf27bd979af42
This commit is contained in:
yatinkarel 2019-07-17 14:41:03 +05:30
parent f99be0d82c
commit a23aa80c40
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment/swift/swift-ringbuilder-container-puppet.yaml
View File

@ -104,7 +104,7 @@ outputs:
# BEGIN DOCKER SETTINGS
puppet_config:
config_volume: 'swift_ringbuilder'
puppet_tags: exec,fetch_swift_ring_tarball,extract_swift_ring_tarball,ring_object_device,swift::ringbuilder::create,tripleo::profile::base::swift::add_devices,swift::ringbuilder::rebalance,create_swift_ring_tarball,upload_swift_ring_tarball
puppet_tags: swift_config,exec,fetch_swift_ring_tarball,extract_swift_ring_tarball,ring_object_device,swift::ringbuilder::create,tripleo::profile::base::swift::add_devices,swift::ringbuilder::rebalance,create_swift_ring_tarball,upload_swift_ring_tarball
step_config: |
include ::tripleo::profile::base::swift::ringbuilder
config_image: &swift_ringbuilder_image {get_param: ContainerSwiftConfigImage}