commit e371ec664638fc104990c5e4cdfacac932468090
Author: James Slagle <email address hidden>
Date: Tue Aug 15 15:59:08 2017 -0400
Separate config_volume for ringbuilder
Use a separate config_volume for swift_ringbuilder puppet_config tasks.
This is necessary so that the swift_ringbuilder and swift-storage
services don't both rsync files to the same bind mounted directory.
The rsync command from docker-puppet.py uses --delete-after, so when
they both use the same config_volume, they can end up deleting the files
generated by the other (depending on the order of execution).
Even though a separate config_volume is used, the rings must still end up
in /etc/swift for the swift services containers. An additional
container init task is used to copy the ring files into
/var/lib/config-data/puppet-generated/swift/etc/swift so that they will
be present when the actual swift services containers are started.
Change-Id: I05821e76191f64212704ca8e3b7428cda6b3a4b7
Closes-Bug: #1710952
(cherry picked from commit cba00abb7517efa6a8d9b8fb954563204323ffed)
Reviewed: https:/ /review. openstack. org/499457 /git.openstack. org/cgit/ openstack/ tripleo- heat-templates/ commit/ ?id=e371ec66463 8fc104990c5e4cd facac932468090
Committed: https:/
Submitter: Jenkins
Branch: stable/pike
commit e371ec664638fc1 04990c5e4cdfaca c932468090
Author: James Slagle <email address hidden>
Date: Tue Aug 15 15:59:08 2017 -0400
Separate config_volume for ringbuilder
Use a separate config_volume for swift_ringbuilder puppet_config tasks.
This is necessary so that the swift_ringbuilder and swift-storage
services don't both rsync files to the same bind mounted directory.
The rsync command from docker-puppet.py uses --delete-after, so when
they both use the same config_volume, they can end up deleting the files
generated by the other (depending on the order of execution).
Even though a separate config_volume is used, the rings must still end up lib/config- data/puppet- generated/ swift/etc/ swift so that they will
in /etc/swift for the swift services containers. An additional
container init task is used to copy the ring files into
/var/
be present when the actual swift services containers are started.
Change-Id: I05821e76191f64 212704ca8e3b742 8cda6b3a4b7 6a8d9b8fb954563 204323ffed)
Closes-Bug: #1710952
(cherry picked from commit cba00abb7517efa