From 72fb45f3c40705359afddf2a75d9371352c49737 Mon Sep 17 00:00:00 2001 From: Mehdi Abaakouk Date: Mon, 19 Sep 2016 09:49:39 +0200 Subject: [PATCH] ceph: rename optional extra names - is not allowed in extra name, and are silently ignored. We also rename them to make them the extra purpose clearer. Change-Id: I4470050e1a196577e2c667ce7c2949d82655f77c --- doc/source/install.rst | 8 ++++---- setup.cfg | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/source/install.rst b/doc/source/install.rst index 6cf36d1e..08d03006 100644 --- a/doc/source/install.rst +++ b/doc/source/install.rst @@ -47,8 +47,8 @@ The list of variants available is: * postgresql – provides PostgreSQL indexer support * swift – provides OpenStack Swift storage support * ceph – provides common part of Ceph storage support -* ceph-pre-jewel – provides Ceph (<10.1.0) storage support -* ceph-jewel-and-later – provides Ceph (>=10.1.0) storage support +* ceph_recommended_lib – provides Ceph (>=0.80) storage support +* ceph_alternative_lib – provides Ceph (>=10.1.0) storage support * file – provides file driver support * doc – documentation building support * test – unit and functional tests support @@ -61,7 +61,7 @@ procedure:: Again, depending on the drivers and features you want to use, you need to install extra variants using, for example:: - pip install -e .[postgresql,ceph,ceph-pre-jewel] + pip install -e .[postgresql,ceph,ceph_recommended_lib] Ceph requirements @@ -72,7 +72,7 @@ only since python-rados >= 9.1.0. To handle this, Gnocchi uses 'cradox' python library which has exactly the same API but works with Ceph >= 0.80.0. If Ceph and python-rados are >= 9.1.0, cradox python library becomes optional -but is still recommended until 10.1.0. +but is still recommended. Initialization diff --git a/setup.cfg b/setup.cfg index ff18611e..5a5119ab 100644 --- a/setup.cfg +++ b/setup.cfg @@ -44,9 +44,9 @@ ceph = msgpack-python lz4 tooz>=1.38 -ceph-pre-jewel = +ceph_recommended_lib = cradox>=1.0.9 -ceph-jewel-and-later = +ceph_alternative_lib = python-rados>=10.1.0 # not available on pypi file = msgpack-python