From 3fb376dac2aed1c3f87d15bf98db47c322a0d303 Mon Sep 17 00:00:00 2001 From: Mohammed Junaid Date: Thu, 16 May 2013 08:52:36 +0530 Subject: Update the configuration files with the name in setup.py file. Change-Id: I38c6d49143092c6c211216b285f1758706a5a89c Signed-off-by: Mohammed Junaid Reviewed-on: http://review.gluster.org/5046 Reviewed-by: Peter Portante Tested-by: Luis Pabon Reviewed-by: Luis Pabon --- etc/account-server.conf-gluster | 19 +++++++++++++++++++ etc/account-server/1.conf-gluster | 19 ------------------- etc/container-server.conf-gluster | 21 +++++++++++++++++++++ etc/container-server/1.conf-gluster | 21 --------------------- etc/object-server.conf-gluster | 36 ++++++++++++++++++++++++++++++++++++ etc/object-server/1.conf-gluster | 36 ------------------------------------ etc/proxy-server.conf-gluster | 2 +- 7 files changed, 77 insertions(+), 77 deletions(-) create mode 100644 etc/account-server.conf-gluster delete mode 100644 etc/account-server/1.conf-gluster create mode 100644 etc/container-server.conf-gluster delete mode 100644 etc/container-server/1.conf-gluster create mode 100644 etc/object-server.conf-gluster delete mode 100644 etc/object-server/1.conf-gluster (limited to 'etc') diff --git a/etc/account-server.conf-gluster b/etc/account-server.conf-gluster new file mode 100644 index 0000000..420f54d --- /dev/null +++ b/etc/account-server.conf-gluster @@ -0,0 +1,19 @@ +[DEFAULT] +devices = /mnt/gluster-object +mount_check = true +bind_port = 6012 +user = root +log_facility = LOG_LOCAL2 + +[pipeline:main] +pipeline = account-server + +[app:account-server] +use = egg:gluster_swift#account + +[account-replicator] +vm_test_mode = yes + +[account-auditor] + +[account-reaper] diff --git a/etc/account-server/1.conf-gluster b/etc/account-server/1.conf-gluster deleted file mode 100644 index da8f317..0000000 --- a/etc/account-server/1.conf-gluster +++ /dev/null @@ -1,19 +0,0 @@ -[DEFAULT] -devices = /mnt/gluster-object -mount_check = true -bind_port = 6012 -user = root -log_facility = LOG_LOCAL2 - -[pipeline:main] -pipeline = account-server - -[app:account-server] -use = egg:gluster_swift_ufo#account - -[account-replicator] -vm_test_mode = yes - -[account-auditor] - -[account-reaper] diff --git a/etc/container-server.conf-gluster b/etc/container-server.conf-gluster new file mode 100644 index 0000000..21477dc --- /dev/null +++ b/etc/container-server.conf-gluster @@ -0,0 +1,21 @@ +[DEFAULT] +devices = /mnt/gluster-object +mount_check = true +bind_port = 6011 +user = root +log_facility = LOG_LOCAL2 + +[pipeline:main] +pipeline = container-server + +[app:container-server] +use = egg:gluster_swift#container + +[container-replicator] +vm_test_mode = yes + +[container-updater] + +[container-auditor] + +[container-sync] diff --git a/etc/container-server/1.conf-gluster b/etc/container-server/1.conf-gluster deleted file mode 100644 index acad621..0000000 --- a/etc/container-server/1.conf-gluster +++ /dev/null @@ -1,21 +0,0 @@ -[DEFAULT] -devices = /mnt/gluster-object -mount_check = true -bind_port = 6011 -user = root -log_facility = LOG_LOCAL2 - -[pipeline:main] -pipeline = container-server - -[app:container-server] -use = egg:gluster_swift_ufo#container - -[container-replicator] -vm_test_mode = yes - -[container-updater] - -[container-auditor] - -[container-sync] diff --git a/etc/object-server.conf-gluster b/etc/object-server.conf-gluster new file mode 100644 index 0000000..effecd1 --- /dev/null +++ b/etc/object-server.conf-gluster @@ -0,0 +1,36 @@ +[DEFAULT] +devices = /mnt/gluster-object +mount_check = true +bind_port = 6010 +# If not doing the above, setting this value initially to match the number of +# CPUs is a good starting point for determining the right value. +workers = 1 + +[pipeline:main] +pipeline = object-server + +[app:object-server] +use = egg:gluster_swift#object +user = root +log_facility = LOG_LOCAL2 +# Timeout clients that don't read or write to the proxy server after 5 +# seconds. +conn_timeout = 5 +# For high load situations, once connected to a container server, allow for +# delays communicating with it. +node_timeout = 60 +# Adjust this value to match the stripe width of the underlying storage array +# (not the stripe element size). This will provide a reasonable starting point +# for tuning this value. +disk_chunk_size = 65536 +# Adjust this value match whatever is set for the disk_chunk_size +# initially. This will provide a reasonable starting point for tuning this +# value. +network_chunk_size = 65556 + +[object-replicator] +vm_test_mode = yes + +[object-updater] + +[object-auditor] diff --git a/etc/object-server/1.conf-gluster b/etc/object-server/1.conf-gluster deleted file mode 100644 index 0d85546..0000000 --- a/etc/object-server/1.conf-gluster +++ /dev/null @@ -1,36 +0,0 @@ -[DEFAULT] -devices = /mnt/gluster-object -mount_check = true -bind_port = 6010 -# If not doing the above, setting this value initially to match the number of -# CPUs is a good starting point for determining the right value. -workers = 1 - -[pipeline:main] -pipeline = object-server - -[app:object-server] -use = egg:gluster_swift_ufo#object -user = root -log_facility = LOG_LOCAL2 -# Timeout clients that don't read or write to the proxy server after 5 -# seconds. -conn_timeout = 5 -# For high load situations, once connected to a container server, allow for -# delays communicating with it. -node_timeout = 60 -# Adjust this value to match the stripe width of the underlying storage array -# (not the stripe element size). This will provide a reasonable starting point -# for tuning this value. -disk_chunk_size = 65536 -# Adjust this value match whatever is set for the disk_chunk_size -# initially. This will provide a reasonable starting point for tuning this -# value. -network_chunk_size = 65556 - -[object-replicator] -vm_test_mode = yes - -[object-updater] - -[object-auditor] diff --git a/etc/proxy-server.conf-gluster b/etc/proxy-server.conf-gluster index e04efec..331fb02 100644 --- a/etc/proxy-server.conf-gluster +++ b/etc/proxy-server.conf-gluster @@ -9,7 +9,7 @@ workers = 1 pipeline = healthcheck cache tempauth proxy-server [app:proxy-server] -use = egg:gluster_swift_ufo#proxy +use = egg:gluster_swift#proxy log_facility = LOG_LOCAL1 # The API allows for account creation and deletion, but since Gluster/Swift # automounts a Gluster volume for a given account, there is no way to create -- cgit