Merge "Configure passthrough in swift config files"

openstack-archive · Jun 12, 2014 · 1952eaa · 1952eaa
2 parents b5583b8 + c7fe480
commit 1952eaa
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 0 deletions.
diff --git a/elements/swift-proxy/os-config-applier/etc/swift/proxy-server.conf b/elements/swift-proxy/os-config-applier/etc/swift/proxy-server.conf
@@ -52,3 +52,18 @@ use = egg:swift#account_quotas
 [app:proxy-server]
 use = egg:swift#proxy
 account_autocreate = true
+
+{{#swift-proxy-server}}
+{{#config}}
+[{{{section}}}]
+{{#values}}
+{{#comment}}
+# {{{.}}}
+{{/comment}}
+{{#option}}
+{{{option}}} = {{{value}}}
+{{/option}}
+{{/values}}
+
+{{/config}}
+{{/swift-proxy-server}}
diff --git a/elements/swift-storage/os-config-applier/etc/swift/account-server.conf b/elements/swift-storage/os-config-applier/etc/swift/account-server.conf
@@ -22,3 +22,18 @@ recon_cache_path = /mnt/state/var/cache/swift
 
 [account-replicator]
 recon_cache_path = /mnt/state/var/cache/swift
+
+{{#swift-account-server}}
+{{#config}}
+[{{{section}}}]
+{{#values}}
+{{#comment}}
+# {{{.}}}
+{{/comment}}
+{{#option}}
+{{{option}}} = {{{value}}}
+{{/option}}
+{{/values}}
+
+{{/config}}
+{{/swift-account-server}}
diff --git a/elements/swift-storage/os-config-applier/etc/swift/container-server.conf b/elements/swift-storage/os-config-applier/etc/swift/container-server.conf
@@ -24,3 +24,18 @@ recon_cache_path = /mnt/state/var/cache/swift
 
 [container-updater]
 recon_cache_path = /mnt/state/var/cache/swift
+
+{{#swift-container-server}}
+{{#config}}
+[{{{section}}}]
+{{#values}}
+{{#comment}}
+# {{{.}}}
+{{/comment}}
+{{#option}}
+{{{option}}} = {{{value}}}
+{{/option}}
+{{/values}}
+
+{{/config}}
+{{/swift-container-server}}
diff --git a/elements/swift-storage/os-config-applier/etc/swift/object-server.conf b/elements/swift-storage/os-config-applier/etc/swift/object-server.conf
@@ -23,3 +23,18 @@ recon_cache_path = /mnt/state/var/cache/swift
 
 [object-updater]
 recon_cache_path = /mnt/state/var/cache/swift
+
+{{#swift-object-server}}
+{{#config}}
+[{{{section}}}]
+{{#values}}
+{{#comment}}
+# {{{.}}}
+{{/comment}}
+{{#option}}
+{{{option}}} = {{{value}}}
+{{/option}}
+{{/values}}
+
+{{/config}}
+{{/swift-object-server}}