From 00af8bfc1a844f3bb10452f313e5d4d5b42b04a9 Mon Sep 17 00:00:00 2001 From: Andrew Lazarev Date: Fri, 15 Aug 2014 11:43:29 -0700 Subject: [PATCH] Removed sqlite from docs Change-Id: I002606a43eae507c9f0b44db83a7d8994cad2cb5 Closes-Bug: #1357062 --- doc/source/userdoc/configuration.guide.rst | 14 +++----------- doc/source/userdoc/upgrade.guide.rst | 9 ++++++--- sahara/db/api.py | 2 +- 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/doc/source/userdoc/configuration.guide.rst b/doc/source/userdoc/configuration.guide.rst index fb0e3f109b..faceb93cea 100644 --- a/doc/source/userdoc/configuration.guide.rst +++ b/doc/source/userdoc/configuration.guide.rst @@ -12,22 +12,14 @@ based on the basic sample, as most probably changing parameters listed here will be enough. First, edit ``connection`` parameter in the ``[database]`` section. The URL -provided here should point to an empty database. In case of SQLite, if the -database file does not exist, it will be automatically created -by ``sahara-db-manage``. For instance, the following URL should work in -most environments: +provided here should point to an empty database. For instance, connection +string for mysql database will be: .. sourcecode:: cfg - connection=sqlite:////tmp/sahara.db + connection=mysql://username:password@host:port/database .. -Note that we recommend using MySQL or PostgreSQL backends for setups -other than experimental. This is especially important if you plan to -migrate later to a newer version of Sahara. With SQLite you will -either have to start from scratch or migrate your DB to MySQL or -PostgreSQL, which might be non-trivial. - Switch to the ``[keystone_authtoken]`` section. The ``auth_uri`` parameter should point to the public Identity API endpoint. ``identity_uri`` should point to the admin Identity API endpoint. For example: diff --git a/doc/source/userdoc/upgrade.guide.rst b/doc/source/userdoc/upgrade.guide.rst index 1a590513aa..65261f84df 100644 --- a/doc/source/userdoc/upgrade.guide.rst +++ b/doc/source/userdoc/upgrade.guide.rst @@ -28,9 +28,12 @@ old config opts with the new ones. * ``os_admin_tenant_name`` -> ``[keystone_authtoken]/admin_tenant_name`` We've replaced oslo code from sahara.openstack.common.db by usage of oslo.db -library. Default sqlite db name was changed as follows. +library. -* ``sahara.sqlite`` -> ``oslo.sqlite`` +Also sqlite database is not supported anymore. Please use MySQL or PostgreSQL +db backends for Sahara. Sqlite support was dropped because it doesn't support +(and not going to support, see http://www.sqlite.org/omitted.html) ALTER +COLUMN and DROP COLUMN commands required for DB migrations between versions. -You can find more info about config file options in sahara repository in file +You can find more info about config file options in Sahara repository in file ``etc/sahara/sahara.conf.sample``. diff --git a/sahara/db/api.py b/sahara/db/api.py index fdfef9431d..bb972945b0 100644 --- a/sahara/db/api.py +++ b/sahara/db/api.py @@ -27,7 +27,7 @@ interface. `sqlalchemy` is the only supported backend right now. :sql_connection: string specifying the sqlalchemy connection to use, like: - `sqlite:///var/lib/sahara/sahara.sqlite`. + `mysql://user:password@localhost/sahara`. """