diff --git a/.travis.yml b/.travis.yml index 76b4775..6e5cf23 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,11 +28,11 @@ matrix: include: - python: 3.9 env: - - PLANETMINT_DATABASE_BACKEND=tarantool + - PLANETMINT_DATABASE_BACKEND=tarantool_db - PLANETMINT_DATABASE_SSL= - python: 3.9 env: - - PLANETMINT_DATABASE_BACKEND=tarantool + - PLANETMINT_DATABASE_BACKEND=tarantool_db - PLANETMINT_DATABASE_SSL= - PLANETMINT_CI_ABCI=enable - python: 3.9 diff --git a/Dockerfile-all-in-one b/Dockerfile-all-in-one index 62cb65a..0f507d2 100644 --- a/Dockerfile-all-in-one +++ b/Dockerfile-all-in-one @@ -34,7 +34,7 @@ RUN mkdir -p /data/db /data/configdb \ # Planetmint enviroment variables ENV PLANETMINT_DATABASE_PORT 27017 -ENV PLANETMINT_DATABASE_BACKEND tarantool +ENV PLANETMINT_DATABASE_BACKEND tarantool_db ENV PLANETMINT_SERVER_BIND 0.0.0.0:9984 ENV PLANETMINT_WSSERVER_HOST 0.0.0.0 ENV PLANETMINT_WSSERVER_SCHEME ws diff --git a/planetmint/commands/planetmint.py b/planetmint/commands/planetmint.py index a21f7f7..752a5af 100644 --- a/planetmint/commands/planetmint.py +++ b/planetmint/commands/planetmint.py @@ -323,9 +323,9 @@ def create_parser(): help='Prepare the config file.') config_parser.add_argument('backend', - choices=['tarantool', 'localmongodb'], - default='tarantool', - const='tarantool', + choices=['tarantool_db', 'localmongodb'], + default='tarantool_db', + const='tarantool_db', nargs='?', help='The backend to use. It can only be ' '"tarantool_db", currently.') diff --git a/tests/conftest.py b/tests/conftest.py index aad8baf..ccb82f7 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -99,7 +99,7 @@ def _configure_planetmint(request): test_db_name = '{}_{}'.format(TEST_DB_NAME, xdist_suffix) # backend = request.config.getoption('--database-backend') - backend = "tarantool" + backend = "tarantool_db" config = { 'database': Config().get_db_map(backend),