diff options
| author |   James Slagle <jslagle@redhat.com> | 2017-08-15 15:59:08 -0400 |
|---|---|---|
| committer |   Emilien Macchi <emilien@redhat.com> | 2017-09-02 15:55:27 +0000 |
| commit | e371ec664638fc104990c5e4cdfacac932468090 (patch) | |
| tree | a7a056153b3a9361959d5dd0fb142fa0e447575e /tools | |
| parent | 79bd4a5c576829470ee0605551cee89233732021 (diff) | |
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)
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/yaml-validate.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/yaml-validate.py b/tools/yaml-validate.py index a096d69a..682cb8df 100755 --- a/tools/yaml-validate.py +++ b/tools/yaml-validate.py @@ -105,7 +105,7 @@ PARAMETER_DEFINITION_EXCLUSIONS = {'ManagementNetCidr': ['default'], 'ControllerExtraConfig': ['description'], 'NovaComputeExtraConfig': ['description'], 'controllerExtraConfig': ['description'], - 'DockerSwiftConfigImage': ['default'], + 'DockerSwiftConfigImage': ['default'] } PREFERRED_CAMEL_CASE = { |