Browse code

Merge "Objects versions new style config"

Jenkins authored on 2016/12/01 01:31:18
Showing 1 changed files
... ...
@@ -397,6 +397,9 @@ function configure_swift {
397 397
     iniset ${SWIFT_CONFIG_PROXY_SERVER} app:proxy-server node_timeout 120
398 398
     iniset ${SWIFT_CONFIG_PROXY_SERVER} app:proxy-server conn_timeout 20
399 399
 
400
+    # Versioned Writes
401
+    iniset ${SWIFT_CONFIG_PROXY_SERVER} filter:versioned_writes allow_versioned_writes true
402
+
400 403
     # Configure Ceilometer
401 404
     if is_service_enabled ceilometer; then
402 405
         iniset ${SWIFT_CONFIG_PROXY_SERVER} filter:ceilometer "set log_level" "WARN"
... ...
@@ -489,8 +492,6 @@ EOF
489 489
         generate_swift_config_services ${swift_node_config} ${node_number} $(( CONTAINER_PORT_BASE + 10 * (node_number - 1) )) container
490 490
         iniuncomment ${swift_node_config} DEFAULT bind_ip
491 491
         iniset ${swift_node_config} DEFAULT bind_ip ${SWIFT_SERVICE_LISTEN_ADDRESS}
492
-        iniuncomment ${swift_node_config} app:container-server allow_versions
493
-        iniset ${swift_node_config} app:container-server allow_versions  "true"
494 492
 
495 493
         swift_node_config=${SWIFT_CONF_DIR}/account-server/${node_number}.conf
496 494
         cp ${SWIFT_DIR}/etc/account-server.conf-sample ${swift_node_config}