From 95ed4f6a9b3b4adb096f5e5dd6c37a615518097c Mon Sep 17 00:00:00 2001
From: Matt Thompson <mattt@defunct.ca>
Date: Mon, 2 Mar 2015 11:35:01 +0000
Subject: [PATCH] Allow swift object versioning to be enabled

By default, allowed_versions (swift object versioning) is disabled.
This change allows the deployer to determine if this feature should be
enabled or disabled.  The default value in the os_swift role for this
feature is True (enabled).

Change-Id: I837e0c0d063cacf911ba2461af21df3da5791afb
Closes-Bug: 1427154
---
 playbooks/roles/os_swift/defaults/main.yml                  | 1 +
 playbooks/roles/os_swift/templates/container-server.conf.j2 | 1 +
 2 files changed, 2 insertions(+)

diff --git a/playbooks/roles/os_swift/defaults/main.yml b/playbooks/roles/os_swift/defaults/main.yml
index 10f397f1dc..70913c42f8 100644
--- a/playbooks/roles/os_swift/defaults/main.yml
+++ b/playbooks/roles/os_swift/defaults/main.yml
@@ -61,6 +61,7 @@ swift_default_min_part_hours: 1
 swift_default_host_zone: 0
 swift_default_host_region: 1
 swift_default_drive_weight: 100
+swift_allow_versions: True
 
 ## Swift Auth
 swift_service_admin_tenant_name: "service"
diff --git a/playbooks/roles/os_swift/templates/container-server.conf.j2 b/playbooks/roles/os_swift/templates/container-server.conf.j2
index dd0621b953..1e3c7bf256 100644
--- a/playbooks/roles/os_swift/templates/container-server.conf.j2
+++ b/playbooks/roles/os_swift/templates/container-server.conf.j2
@@ -23,6 +23,7 @@ pipeline = healthcheck recon container-server
 [app:container-server]
 use = egg:swift#container
 log_facility = LOG_LOCAL3
+allow_versions = {{ swift_allow_versions }}
 
 [filter:healthcheck]
 use = egg:swift#healthcheck