diff --git a/glance/files/juno/glance-api.conf.Debian b/glance/files/juno/glance-api.conf.Debian
index 13defbd..7f8b7f7 100644
--- a/glance/files/juno/glance-api.conf.Debian
+++ b/glance/files/juno/glance-api.conf.Debian
@@ -268,41 +268,41 @@
 
 # Version of the authentication service to use
 # Valid versions are '2' for keystone and '1' for swauth and rackspace
-swift_store_auth_version = 2
+#swift_store_auth_version = 2
 
 # Address where the Swift authentication service lives
 # Valid schemes are 'http://' and 'https://'
 # If no scheme specified,  default to 'https://'
 # For swauth, use something like '127.0.0.1:8080/v1.0/'
-swift_store_auth_address = 127.0.0.1:5000/v2.0/
+#swift_store_auth_address = 127.0.0.1:5000/v2.0/
 
 # User to authenticate against the Swift authentication service
 # If you use Swift authentication service, set it to 'account':'user'
 # where 'account' is a Swift storage account and 'user'
 # is a user in that account
-swift_store_user = jdoe:jdoe
+#swift_store_user = jdoe:jdoe
 
 # Auth key for the user authenticating against the
 # Swift authentication service
-swift_store_key = a86850deb2742ec3cb41518e26aa2d89
+#swift_store_key = a86850deb2742ec3cb41518e26aa2d89
 
 # Container within the account that the account should use
 # for storing images in Swift
-swift_store_container = glance
+#swift_store_container = glance
 
 # Do we create the container if it does not exist?
-swift_store_create_container_on_put = False
+#swift_store_create_container_on_put = False
 
 # What size, in MB, should Glance start chunking image files
 # and do a large object manifest in Swift? By default, this is
 # the maximum object size in Swift, which is 5GB
-swift_store_large_object_size = 5120
+#swift_store_large_object_size = 5120
 
 # When doing a large object manifest, what size, in MB, should
 # Glance write chunks to Swift? This amount of data is written
 # to a temporary disk buffer during the process of chunking
 # the image file, and the default is 200MB
-swift_store_large_object_chunk_size = 200
+#swift_store_large_object_chunk_size = 200
 
 # Whether to use ServiceNET to communicate with the Swift storage servers.
 # (If you aren't RACKSPACE, leave this False!)
@@ -310,7 +310,7 @@
 # To use ServiceNET for authentication, prefix hostname of
 # `swift_store_auth_address` with 'snet-'.
 # Ex. https://example.com/v1.0/ -> https://snet-example.com/v1.0/
-swift_enable_snet = False
+#swift_enable_snet = False
 
 # If set to True enables multi-tenant storage mode which causes Glance images
 # to be stored in tenant specific Swift accounts.
diff --git a/glance/files/kilo/glance-api.conf.Debian b/glance/files/kilo/glance-api.conf.Debian
index 54a91b0..74cdb60 100644
--- a/glance/files/kilo/glance-api.conf.Debian
+++ b/glance/files/kilo/glance-api.conf.Debian
@@ -616,35 +616,35 @@
 
 # Version of the authentication service to use
 # Valid versions are '2' for keystone and '1' for swauth and rackspace
-swift_store_auth_version = 2
+# swift_store_auth_version = 2
 
 # Address where the Swift authentication service lives
 # Valid schemes are 'http://' and 'https://'
 # If no scheme specified,  default to 'https://'
 # For swauth, use something like '127.0.0.1:8080/v1.0/'
-swift_store_auth_address = 127.0.0.1:5000/v2.0/
+# swift_store_auth_address = 127.0.0.1:5000/v2.0/
 
 # User to authenticate against the Swift authentication service
 # If you use Swift authentication service, set it to 'account':'user'
 # where 'account' is a Swift storage account and 'user'
 # is a user in that account
-swift_store_user = jdoe:jdoe
+# swift_store_user = jdoe:jdoe
 
 # Auth key for the user authenticating against the
 # Swift authentication service
-swift_store_key = a86850deb2742ec3cb41518e26aa2d89
+# swift_store_key = a86850deb2742ec3cb41518e26aa2d89
 
 # Container within the account that the account should use
 # for storing images in Swift
-swift_store_container = glance
+# swift_store_container = glance
 
 # Do we create the container if it does not exist?
-swift_store_create_container_on_put = False
+# swift_store_create_container_on_put = False
 
 # What size, in MB, should Glance start chunking image files
 # and do a large object manifest in Swift? By default, this is
 # the maximum object size in Swift, which is 5GB
-swift_store_large_object_size = 5120
+# swift_store_large_object_size = 5120
 
 # swift_store_config_file = glance-swift.conf
 # This file contains references for each of the configured
@@ -659,7 +659,7 @@
 # Glance write chunks to Swift? This amount of data is written
 # to a temporary disk buffer during the process of chunking
 # the image file, and the default is 200MB
-swift_store_large_object_chunk_size = 200
+# swift_store_large_object_chunk_size = 200
 
 # If set, the configured endpoint will be used. If None, the storage URL
 # from the auth response will be used. The location of an object is
@@ -720,14 +720,14 @@
 # Address where the S3 authentication service lives
 # Valid schemes are 'http://' and 'https://'
 # If no scheme specified,  default to 'http://'
-s3_store_host = s3.amazonaws.com
+#s3_store_host = s3.amazonaws.com
 
 # User to authenticate against the S3 authentication service
-s3_store_access_key = <20-char AWS access key>
+#s3_store_access_key = <20-char AWS access key>
 
 # Auth key for the user authenticating against the
 # S3 authentication service
-s3_store_secret_key = <40-char AWS secret key>
+#s3_store_secret_key = <40-char AWS secret key>
 
 # Container within the account that the account should use
 # for storing images in S3. Note that S3 has a flat namespace,
@@ -735,10 +735,10 @@
 # easy way to do this is append your AWS access key to "glance".
 # S3 buckets in AWS *must* be lowercased, so remember to lowercase
 # your AWS access key if you use it in your bucket name below!
-s3_store_bucket = <lowercased 20-char aws access key>glance
+#s3_store_bucket = <lowercased 20-char aws access key>glance
 
 # Do we create the bucket if it does not exist?
-s3_store_create_bucket_on_put = False
+#s3_store_create_bucket_on_put = False
 
 # When sending images to S3, the data will first be written to a
 # temporary buffer on disk. By default the platform's temporary directory
diff --git a/glance/files/liberty/glance-api.conf.Debian b/glance/files/liberty/glance-api.conf.Debian
index 98c2841..3ecb86b 100644
--- a/glance/files/liberty/glance-api.conf.Debian
+++ b/glance/files/liberty/glance-api.conf.Debian
@@ -622,30 +622,30 @@
 
 # Version of the authentication service to use
 # Valid versions are '2' for keystone and '1' for swauth and rackspace
-swift_store_auth_version = 2
+#swift_store_auth_version = 2
 
 # Address where the Swift authentication service lives
 # Valid schemes are 'http://' and 'https://'
 # If no scheme specified,  default to 'https://'
 # For swauth, use something like '127.0.0.1:8080/v1.0/'
-swift_store_auth_address = 127.0.0.1:5000/v2.0/
+#swift_store_auth_address = 127.0.0.1:5000/v2.0/
 
 # User to authenticate against the Swift authentication service
 # If you use Swift authentication service, set it to 'account':'user'
 # where 'account' is a Swift storage account and 'user'
 # is a user in that account
-swift_store_user = jdoe:jdoe
+#swift_store_user = jdoe:jdoe
 
 # Auth key for the user authenticating against the
 # Swift authentication service
-swift_store_key = a86850deb2742ec3cb41518e26aa2d89
+#swift_store_key = a86850deb2742ec3cb41518e26aa2d89
 
 # Container within the account that the account should use
 # for storing images in Swift
-swift_store_container = glance
+#swift_store_container = glance
 
 # Do we create the container if it does not exist?
-swift_store_create_container_on_put = False
+#swift_store_create_container_on_put = False
 
 # What size, in MB, should Glance start chunking image files
 # and do a large object manifest in Swift? By default, this is
@@ -726,14 +726,14 @@
 # Address where the S3 authentication service lives
 # Valid schemes are 'http://' and 'https://'
 # If no scheme specified,  default to 'http://'
-s3_store_host = s3.amazonaws.com
+#s3_store_host = s3.amazonaws.com
 
 # User to authenticate against the S3 authentication service
-s3_store_access_key = <20-char AWS access key>
+#s3_store_access_key = <20-char AWS access key>
 
 # Auth key for the user authenticating against the
 # S3 authentication service
-s3_store_secret_key = <40-char AWS secret key>
+#s3_store_secret_key = <40-char AWS secret key>
 
 # Container within the account that the account should use
 # for storing images in S3. Note that S3 has a flat namespace,
@@ -741,7 +741,7 @@
 # easy way to do this is append your AWS access key to "glance".
 # S3 buckets in AWS *must* be lowercased, so remember to lowercase
 # your AWS access key if you use it in your bucket name below!
-s3_store_bucket = <lowercased 20-char aws access key>glance
+#s3_store_bucket = <lowercased 20-char aws access key>glance
 
 # Do we create the bucket if it does not exist?
 s3_store_create_bucket_on_put = False
@@ -800,9 +800,9 @@
 
 # ============ Sheepdog Store Options =============================
 
-sheepdog_store_address = localhost
+#sheepdog_store_address = localhost
 
-sheepdog_store_port = 7000
+#sheepdog_store_port = 7000
 
 # Images will be chunked into objects of this size (in megabytes).
 # For best performance, this should be a power of two