From f482f2fdf4f987d1fbdf9be17ab1c348cbe8900f Mon Sep 17 00:00:00 2001 From: Thiago da Silva Date: Mon, 18 Aug 2014 13:20:15 -0400 Subject: [PATCH] Updating SwiftOnFile version to release 2.0 Updated sof version and tox swift dependency to release 2.0. Also, made some documentation changes to the object-server configuration sample file to point out that volume must mounted before starting sof object-server. Signed-off-by: Thiago da Silva --- etc/object-server.conf-swiftonfile | 17 +++++++---------- swiftonfile/swift/__init__.py | 2 +- tox.ini | 2 +- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/etc/object-server.conf-swiftonfile b/etc/object-server.conf-swiftonfile index 262256f..9293fd5 100644 --- a/etc/object-server.conf-swiftonfile +++ b/etc/object-server.conf-swiftonfile @@ -1,16 +1,13 @@ [DEFAULT] # -# Default gluster mount point to be used for object store,can be changed by -# setting the following value in {account,container,object}-server.conf files. -# It is recommended to keep this value same for all the three services but can -# be kept different if environment demands. +# Default swiftonfile mount point to be used for object server +# This mount point is the parent directory to the device specified +# in this swiftonfile object ring. devices = /mnt/swiftonfile # -# Once you are confident that your startup processes will always have your -# gluster volumes properly mounted *before* the object-server workers start, -# you can *consider* setting this value to "false" to reduce the per-request -# overhead it can incur. -mount_check = true +# You must always have the volume properly mounted *before* starting the +# SwiftOnFile object-server. +mount_check = false bind_port = 6050 # # Maximum number of clients one worker can process simultaneously (it will @@ -31,7 +28,7 @@ pipeline = object-server [app:object-server] use = egg:swiftonfile#object -user = root +user = log_facility = LOG_LOCAL2 log_level = WARN # For performance, after ensuring things are running in a stable manner, you diff --git a/swiftonfile/swift/__init__.py b/swiftonfile/swift/__init__.py index 5a8c3c0..17a3222 100644 --- a/swiftonfile/swift/__init__.py +++ b/swiftonfile/swift/__init__.py @@ -45,6 +45,6 @@ class PkgInfo(object): ### ### Change the Package version here ### -_pkginfo = PkgInfo('1.13.1', '0', 'swiftonfile', False) +_pkginfo = PkgInfo('2.0.0', '0', 'swiftonfile', False) __version__ = _pkginfo.pretty_version __canonical_version__ = _pkginfo.canonical_version diff --git a/tox.ini b/tox.ini index 5d56bcb..4d67472 100644 --- a/tox.ini +++ b/tox.ini @@ -20,7 +20,7 @@ setenv = VIRTUAL_ENV={envdir} deps = # GitHub's .zip URL won't work! pip supports installing from git repos. # https://pip.pypa.io/en/latest/reference/pip_install.html#git - git+https://github.com/openstack/swift.git@2.0.0.rc1 + git+https://github.com/openstack/swift.git@2.0.0 -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt changedir = {toxinidir}/test/unit